Removed 'netcat' default log4j logging, removed deprecated PVOutput s…

…tuff, removed MX convenience fields
wildmountainfarms · Aug 31, 2021 · 2e836f8 · 2e836f8
1 parent d0dc7e9
commit 2e836f8
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 59 deletions.
diff --git a/client/src/main/resources/log4j2.xml b/client/src/main/resources/log4j2.xml
@@ -25,9 +25,9 @@
                 </Delete>
             </DefaultRolloverStrategy>
         </RollingFile>
-        <ServerSocket name="logAllToLocalSocket" host="localhost" port="15400" ignoreExceptions="false">
-            <PatternLayout pattern="${LOG_PATTERN}"/>
-        </ServerSocket>
+<!--        <ServerSocket name="logAllToLocalSocket" host="localhost" port="15400" ignoreExceptions="false">-->
+<!--            <PatternLayout pattern="${LOG_PATTERN}"/>-->
+<!--        </ServerSocket>-->
 
         <RollingFile name="logInfo" fileName="${logPath}/log_info.log" filePattern="${logPath}/log_info_%d{yyyy.MM.dd}-%i.log.gz"
                      filePermissions="${filePermissions}">
@@ -64,7 +64,7 @@
     <Loggers>
         <Root level="DEBUG" >
             <AppenderRef ref="Console" level="DEBUG"/>
-            <AppenderRef ref="logAllToLocalSocket" level="DEBUG"/>
+<!--            <AppenderRef ref="logAllToLocalSocket" level="DEBUG"/>-->
         </Root>
         <Logger name="me.retrodaredevil.solarthing">
             <AppenderRef ref="logAll" level="DEBUG"/>

diff --git a/.../src/main/java/me/retrodaredevil/solarthing/solar/outback/mx/ImmutableMXStatusPacket.java b/.../src/main/java/me/retrodaredevil/solarthing/solar/outback/mx/ImmutableMXStatusPacket.java
@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import me.retrodaredevil.solarthing.annotations.NotNull;
+import me.retrodaredevil.solarthing.annotations.Nullable;
 import me.retrodaredevil.solarthing.packets.identification.IdentityInfo;
 import me.retrodaredevil.solarthing.packets.support.Support;
 import me.retrodaredevil.solarthing.solar.outback.OutbackIdentifier;
@@ -13,6 +14,7 @@
 		"batteryVoltageString", "dailyKWHString", "ampChargerCurrentString"
 }, allowGetters = true)
 final class ImmutableMXStatusPacket implements MXStatusPacket {
+	private final @Nullable Integer packetVersion;
 	private final int address;
 	private final int chargerCurrent, pvCurrent, inputVoltage;
 	private final float dailyKWH;
@@ -30,6 +32,7 @@ final class ImmutableMXStatusPacket implements MXStatusPacket {
 
 	@JsonCreator
 	ImmutableMXStatusPacket(
+			@JsonProperty("packetVersion") Integer packetVersion,
 			@JsonProperty(value = "address", required = true) int address, @JsonProperty(value = "chargerCurrent", required = true) int chargerCurrent, @JsonProperty(value = "pvCurrent", required = true) int pvCurrent, @JsonProperty(value = "inputVoltage", required = true) int inputVoltage,
 			@JsonProperty(value = "dailyKWH", required = true) float dailyKWH,
 			@JsonProperty(value = "ampChargerCurrent", required = true) float ampChargerCurrent,
@@ -38,6 +41,7 @@ final class ImmutableMXStatusPacket implements MXStatusPacket {
 			@JsonProperty(value = "dailyAH", required = true) int dailyAH, @JsonProperty(value = "dailyAHSupport") Support dailyAHSupport,
 			@JsonProperty(value = "chksum", required = true) int chksum
 	) {
+		this.packetVersion = packetVersion;
 		this.address = address;
 		this.chargerCurrent = chargerCurrent;
 		this.pvCurrent = pvCurrent;
@@ -56,6 +60,11 @@ final class ImmutableMXStatusPacket implements MXStatusPacket {
 		this.identityInfo = new MXIdentityInfo(address);
 	}
 
+	@Override
+	public @Nullable Integer getPacketVersion() {
+		return packetVersion;
+	}
+
 	@Override
 	public @NotNull IdentityInfo getIdentityInfo() {
 		return identityInfo;

diff --git a/core/src/main/java/me/retrodaredevil/solarthing/solar/outback/mx/MXStatusPacket.java b/core/src/main/java/me/retrodaredevil/solarthing/solar/outback/mx/MXStatusPacket.java
@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import me.retrodaredevil.solarthing.annotations.*;
 import me.retrodaredevil.solarthing.packets.Modes;
+import me.retrodaredevil.solarthing.packets.VersionedPacket;
 import me.retrodaredevil.solarthing.packets.support.Support;
 import me.retrodaredevil.solarthing.solar.SolarStatusPacketType;
 import me.retrodaredevil.solarthing.solar.common.BasicChargeController;
@@ -23,7 +24,11 @@
 @JsonDeserialize(as = ImmutableMXStatusPacket.class)
 @JsonTypeName("MXFM_STATUS")
 @JsonExplicit
-public interface MXStatusPacket extends OutbackStatusPacket, BasicChargeController, DailyChargeController, BatteryVoltage {
+public interface MXStatusPacket extends OutbackStatusPacket, BasicChargeController, DailyChargeController, BatteryVoltage, VersionedPacket {
+
+	/** This version indicates that the packet no longer has convenience string fields. This indicates a different in serialization, not in underlying data. */
+	int VERSION_NO_MORE_CONVENIENCE_FIELDS = 2;
+
 	@DefaultFinal
 	@Override
 	default @NotNull SolarStatusPacketType getPacketType(){
@@ -186,10 +191,9 @@ default int getAuxModeValue() {
 	 * Should be serialized as "dailyAHSupport". Should be serialized using {@link Support#toString()}
 	 * @return A {@link Support} enum constant indicating whether or not {@link #getDailyAH()} is supported
 	 */
-	@NotNull
 	@JsonProperty("dailyAHSupport")
 	@Override
-	Support getDailyAHSupport();
+	@NotNull Support getDailyAHSupport();
 
 	/**
 	 * Should be serialized as "chksum"
@@ -200,10 +204,13 @@ default int getAuxModeValue() {
 	// endregion
 
 	// region Convenience Strings
+	@ConvenienceField
 	@JsonProperty("auxModeName")
 	default @NotNull String getAuxModeName(){ return getAuxMode().getModeName(); }
+	@ConvenienceField
 	@JsonProperty("errors")
 	default @NotNull String getErrorsString(){ return Modes.toString(MXErrorMode.class, getErrorModeValue()); }
+	@ConvenienceField
 	@JsonProperty("chargerModeName")
 	default @NotNull String getChargerModeName(){ return getChargingMode().getModeName(); }
 	// endregion

diff --git a/core/src/main/java/me/retrodaredevil/solarthing/solar/outback/mx/MXStatusPackets.java b/core/src/main/java/me/retrodaredevil/solarthing/solar/outback/mx/MXStatusPackets.java
@@ -134,6 +134,7 @@ public static ImmutableMXStatusPacket createFromChars(char[] chars, IgnoreCheckS
 		}
 
 		return new ImmutableMXStatusPacket(
+				MXStatusPacket.VERSION_NO_MORE_CONVENIENCE_FIELDS,
 				address, chargerCurrent, pvCurrent, inputVoltage, dailyKWH,
 				ampChargerCurrent, auxMode, errorMode, chargerMode,
 				batteryVoltage, dailyAH, dailyAHSupported, chksum

diff --git a/...n/java/me/retrodaredevil/solarthing/pvoutput/data/DeprecatedAddBatchOutputParameters.java b/...n/java/me/retrodaredevil/solarthing/pvoutput/data/DeprecatedAddBatchOutputParameters.java
diff --git a/.../retrodaredevil/solarthing/pvoutput/data/ImmutableDeprecatedAddBatchOutputParameters.java b/.../retrodaredevil/solarthing/pvoutput/data/ImmutableDeprecatedAddBatchOutputParameters.java
diff --git a/serviceapi/src/main/java/me/retrodaredevil/solarthing/pvoutput/service/PVOutputService.java b/serviceapi/src/main/java/me/retrodaredevil/solarthing/pvoutput/service/PVOutputService.java
@@ -1,7 +1,6 @@
 package me.retrodaredevil.solarthing.pvoutput.service;
 
 import me.retrodaredevil.solarthing.pvoutput.data.AddBatchOutputParameters;
-import me.retrodaredevil.solarthing.pvoutput.data.DeprecatedAddBatchOutputParameters;
 import me.retrodaredevil.solarthing.pvoutput.data.AddOutputParameters;
 import me.retrodaredevil.solarthing.pvoutput.data.AddStatusParameters;
 import retrofit2.Call;
@@ -20,10 +19,6 @@ public interface PVOutputService {
 	@POST("addstatus.jsp") // or get
 	Call<String> addStatus(@Body AddStatusParameters parameters);
 
-	@Deprecated
-	@POST("addbatchoutput.jsp")
-	Call<String> addDeprecatedBatchOutput(@Body DeprecatedAddBatchOutputParameters parameters);
-
 	@GET("jointeam.jsp")
 	Call<String> joinTeam(@Query("tid") int teamId);
 }