Add temp wrapper class for deprecated properties logic while we refactor

Author: hugithordarson

ng-appserver/src/main/java/ng/appserver/NGApplication.java

@@ -119,10 +119,10 @@ public static <E extends NGApplication> E runAndReturn( final String[] args, fin
 		properties.addAndReadSourceHighestPriority( new PropertiesSourceArguments( args ) );
 
 		// We need to start out with initializing logging to ensure we're seeing everything the application does during the init phase.
-		redirectOutputToFilesIfOutputPathSet( properties.propWOOutputPath() );
+		redirectOutputToFilesIfOutputPathSet( properties.d().propWOOutputPath() );
 
 		// Determine the mode we're currently running in. CHECKME: This should be configured using an explicit parameter // Hugi 2025-03-16
-		final boolean isDevelopmentMode = !properties.propWOMonitorEnabled();
+		final boolean isDevelopmentMode = !properties.d().propWOMonitorEnabled();
 
 		if( isDevelopmentMode ) {
 			logger.info( "========================================" );
@@ -158,7 +158,7 @@ public static <E extends NGApplication> E runAndReturn( final String[] args, fin
 
 			// What we're doing here is allowing for the WO URL structure, which is required for us to work with the WO Apache Adaptor.
 			// Ideally, we don't want to prefix URLs at all, instead just handling requests at root level.
-			application._urlRewritePatterns.add( Pattern.compile( "^/(cgi-bin|Apps)/WebObjects/" + properties.propWOApplicationName() + ".woa(/[0-9])?" ) );
+			application._urlRewritePatterns.add( Pattern.compile( "^/(cgi-bin|Apps)/WebObjects/" + properties.d().propWOApplicationName() + ".woa(/[0-9])?" ) );
 
 			// FIXME: This is probably not the place to load plugins. Probably need more extension points for plugin initialization (pre-constructor, post-constructor etc.) // Hugi 2023-07-28
 			// We should also allow users to manually register plugins they're going to use for each NGApplication instance, as an alternative to greedily autoloading every provided plugin on the classpath
@@ -177,7 +177,7 @@ public static <E extends NGApplication> E runAndReturn( final String[] args, fin
 			// FIXME: Eventually the adaptor startup should probably be done by the user
 			application.createAdaptor().start( application );
 
-			if( properties.propWOLifebeatEnabled() ) {
+			if( properties.d().propWOLifebeatEnabled() ) {
 				NGDefaultLifeBeatThread.start( application._properties );
 			}
 

ng-appserver/src/main/java/ng/appserver/properties/NGProperties.java

@@ -284,97 +284,17 @@ public String _propertiesMapAsString() {
 		return String.join( "\n", stringKeyPairs );
 	}
 
-	/**
-	 * Defines a property
-	 *
-	 * FIXME: Finish this concept up (for defined, typesafe properties) // Hugi 2023-08-05
-	 */
-	public static class Property<E> {
-		private String _key;
-		private E _value;
-		private E _defaultValue;
-
-		public Property( final String key, E value, E defaultValue ) {
-			_key = key;
-			_value = value;
-			_defaultValue = defaultValue;
-		}
-
-		public String key() {
-			return _key;
-		}
-
-		public E value() {
-			return _value;
-		}
-
-		public E defaultValue() {
-			return _defaultValue;
-		}
-	}
+	private NGPropertiesDeprecated _d;
 
 	/**
-	 * FIXME: We're creating cover methods for some of the more used properties for now. // Hugi 2021-12-29
-	 * This is not the way we it'll be going forward, but it will help with refactoring later (rather than using property name strings)
+	 * FIXME: TEmporary bridge to old properties
 	 */
-	public Integer propWOPort() {
-		return getInteger( WOProperties.WOPort.name() );
-	}
-
-	public String propWOHost() {
-		return get( WOProperties.WOHost.name() );
-	}
-
-	public Integer propWOLifebeatDestinationPort() {
-		return getInteger( WOProperties.WOLifebeatDestinationPort.name() );
-	}
-
-	public Integer propWOLifebeatIntervalInSeconds() {
-		return getInteger( WOProperties.WOLifebeatInterval.name() );
-	}
-
-	public boolean propWOLifebeatEnabled() {
-		return "YES".equals( get( WOProperties.WOLifebeatEnabled.name() ) );
-	}
-
-	public boolean propWOMonitorEnabled() {
-		return "YES".equals( get( WOProperties.WOMonitorEnabled.name() ) );
-	}
-
-	public String propWOApplicationName() {
-		return get( WOProperties.WOApplicationName.name() );
-	}
-
-	public String propWOOutputPath() {
-		return get( WOProperties.WOOutputPath.name() );
-	}
+	@Deprecated
+	public NGPropertiesDeprecated d() {
+		if( _d == null ) {
+			_d = new NGPropertiesDeprecated( this );
+		}
 
-	/**
-	 * Container for all the old properties from WO
-	 */
-	public static enum WOProperties {
-		// Properties in use
-		WOOutputPath,
-		WOApplicationName,
-		WOMonitorEnabled,
-		WOLifebeatEnabled,
-		WOLifebeatInterval,
-		WOLifebeatDestinationPort,
-		WOHost,
-		WOPort,
-
-		// Properties currently NOT in use
-		NSProjectSearchPath,
-		WOAdaptor,
-		WOAutoOpenClientApplication,
-		WOAutoOpenInBrowser,
-		WOCachingEnabled,
-		WODebuggingEnabled,
-		WOListenQueueSize,
-		WONoPause,
-		WOSessionTimeOut,
-		WOWorkerThreadCount,
-		WOWorkerThreadCountMax,
-		WOWorkerThreadCountMin
+		return _d;
 	}
 }

ng-appserver/src/main/java/ng/appserver/properties/NGPropertiesDeprecated.java

@@ -0,0 +1,75 @@
+package ng.appserver.properties;
+
+/**
+ * FIXME: Temp class for holding deprecated logic while we migrate our properties to a nice new model // Hugi 2025-03-25
+ */
+
+public class NGPropertiesDeprecated {
+
+	private final NGProperties _p;
+
+	public NGPropertiesDeprecated( final NGProperties properties ) {
+		_p = properties;
+	}
+
+	/**
+	 * Container for all the old properties from WO
+	 */
+	private enum WOProperties {
+		// Properties in use
+		WOOutputPath,
+		WOApplicationName,
+		WOMonitorEnabled,
+		WOLifebeatEnabled,
+		WOLifebeatInterval,
+		WOLifebeatDestinationPort,
+		WOHost,
+		WOPort,
+
+		// Properties currently NOT in use
+		NSProjectSearchPath,
+		WOAdaptor,
+		WOAutoOpenClientApplication,
+		WOAutoOpenInBrowser,
+		WOCachingEnabled,
+		WODebuggingEnabled,
+		WOListenQueueSize,
+		WONoPause,
+		WOSessionTimeOut,
+		WOWorkerThreadCount,
+		WOWorkerThreadCountMax,
+		WOWorkerThreadCountMin
+	}
+
+	public Integer propWOPort() {
+		return _p.getInteger( WOProperties.WOPort.name() );
+	}
+
+	public String propWOHost() {
+		return _p.get( WOProperties.WOHost.name() );
+	}
+
+	public Integer propWOLifebeatDestinationPort() {
+		return _p.getInteger( WOProperties.WOLifebeatDestinationPort.name() );
+	}
+
+	public Integer propWOLifebeatIntervalInSeconds() {
+		return _p.getInteger( WOProperties.WOLifebeatInterval.name() );
+	}
+
+	public boolean propWOLifebeatEnabled() {
+		return "YES".equals( _p.get( WOProperties.WOLifebeatEnabled.name() ) );
+	}
+
+	public boolean propWOMonitorEnabled() {
+		return "YES".equals( _p.get( WOProperties.WOMonitorEnabled.name() ) );
+	}
+
+	public String propWOApplicationName() {
+		return _p.get( WOProperties.WOApplicationName.name() );
+	}
+
+	public String propWOOutputPath() {
+		return _p.get( WOProperties.WOOutputPath.name() );
+	}
+}

ng-appserver/src/main/java/ng/appserver/wointegration/NGDefaultLifeBeatThread.java

@@ -21,11 +21,11 @@ public class NGDefaultLifeBeatThread {
 	 * Starts a lifebeat thread for communicating with wotaskd.
 	 */
 	public static void start( final NGProperties properties ) {
-		final String hostName = properties.propWOHost();
-		final String appName = properties.propWOApplicationName();
-		final Integer appPort = properties.propWOPort();
-		final Integer lifeBeatDestinationPort = properties.propWOLifebeatDestinationPort();
-		final Integer lifeBeatIntervalInSeconds = properties.propWOLifebeatIntervalInSeconds();
+		final String hostName = properties.d().propWOHost();
+		final String appName = properties.d().propWOApplicationName();
+		final Integer appPort = properties.d().propWOPort();
+		final Integer lifeBeatDestinationPort = properties.d().propWOLifebeatDestinationPort();
+		final Integer lifeBeatIntervalInSeconds = properties.d().propWOLifebeatIntervalInSeconds();
 		final long lifeBeatIntervalInMilliseconds = TimeUnit.MILLISECONDS.convert( lifeBeatIntervalInSeconds, TimeUnit.SECONDS );
 
 		InetAddress hostAddress = null;