Skip to content

Conversation

@ideeley
Copy link
Contributor

@ideeley ideeley commented Jun 18, 2025

@techcobweb
Copy link
Contributor

Note: https://docs.oracle.com/cd/E23095_01/Platform.93/ATGProgGuide/html/s0204propertiesfileformat01.html

Also says that the properties file can have multi-line content, so \ characters ending the line should be treated as a continuation character. Can it handle that too ?

@ideeley
Copy link
Contributor Author

ideeley commented Jul 3, 2025

No, it can't handle multi-line content. It couldn't before either (and yes, I have tested this) so I haven't broken anything. The \ and new line characters are processed as part of the property string, exactly as they were before. I'm not fixing that.

Copy link
Member

@jadecarino jadecarino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have reviewed just the added unit tests given that Mike has reviewed the rest of the changes. Unit tests look good to me, thanks for adding these, happy to approve. Branch needs updating please then I can merge.

@jadecarino
Copy link
Member

jadecarino commented Jul 4, 2025

No, it can't handle multi-line content. It couldn't before either (and yes, I have tested this) so I haven't broken anything. The \ and new line characters are processed as part of the property string, exactly as they were before. I'm not fixing that.

Yes just to continue this discussion, I've just tried this myself and for me I was able to set a CPS property to have multi-line with \, e.g.:

zos.cluster.DEFAULT.images=\
                           IMAGE1,\
                           IMAGE2

and that worked fine and became zos.cluster.DEFAULT.images=IMAGE1,IMAGE2.

But I just tried using a multi-line value for galasactl.jvm.local.launch.options and then the JVM failed to start. So looks like we have a bug there @techcobweb if that property should be able to support multi-line. Ian's changes haven't affected this.

@ideeley
Copy link
Contributor Author

ideeley commented Jul 4, 2025

I was nervous about looking at the multi-line bug on launch options as there are (now) design issues to consider. For example, what do we do if there's a line ending in the middle of an open quoted block?

ideeley added 3 commits July 4, 2025 14:15
Signed-off-by: Ian Deeley <ian_deeley@uk.ibm.com>
Signed-off-by: Ian Deeley <ian_deeley@uk.ibm.com>
Signed-off-by: Ian Deeley <ian_deeley@uk.ibm.com>
@jadecarino jadecarino merged commit 9f04e09 into galasa-dev:main Jul 4, 2025
38 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants