Skip to content

Aligning with minor changes in the 'legacy' pvws code base #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
georgweiss wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Aligning with minor changes in the 'legacy' pvws code base #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e0011d
Aligning with minor changes in the 'legacy' pvws code base
georgweiss Oct 20, 2026
4e0bc53
Update to minimum Java version 17
georgweiss Oct 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<description>EPICS web socket server</description>
<packaging>${packaging.type}</packaging>
<properties>
<java.version>11</java.version>
<java.version>17</java.version>
</properties>
<dependencies>

Expand Down
60 changes: 30 additions & 30 deletions src/main/java/org/phoebus/pvws/ws/Vtype2Json.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,24 +53,24 @@ public static String toJson(final String name, final VType value, final VType la
g.writeStringField("type", "update");
g.writeStringField("pv", name);

if (value instanceof VNumber)
handleNumber(g, (VNumber) value, last_value);
else if (value instanceof VString)
handleString(g, (VString) value, last_value);
else if (value instanceof VEnum)
handleEnum(g, (VEnum) value, last_value);
else if (value instanceof VByteArray)
handleBytes(g, (VNumberArray) value, last_value);
if (value instanceof VNumber vNumber)
handleNumber(g, vNumber, last_value);
else if (value instanceof VString vString)
handleString(g, vString, last_value);
else if (value instanceof VEnum vEnum)
handleEnum(g, vEnum, last_value);
else if (value instanceof VByteArray vByteArray)
handleBytes(g, vByteArray, last_value);

// Serialize double and float arrays as b64dbl
else if (value instanceof VDoubleArray)
handleDoubles(g, (VNumberArray) value, last_value);
else if (value instanceof VFloatArray)
handleFloats(g, (VNumberArray) value, last_value);
else if (value instanceof VDoubleArray vDoubleArray)
handleDoubles(g, vDoubleArray, last_value);
else if (value instanceof VFloatArray vFloatArray)
handleFloats(g, vFloatArray, last_value);

// Serialize remaining number arrays (int) as b64int
else if (value instanceof VNumberArray)
handleInts(g, (VNumberArray) value, last_value);
else if (value instanceof VNumberArray vNumberArray)
handleInts(g, vNumberArray, last_value);

else if (value != null)
{
Expand Down Expand Up @@ -101,8 +101,8 @@ private static void handleString(final JsonGenerator g, final VString value, fin
{
final AlarmSeverity severity = value.getAlarm().getSeverity();
if (last_value == null ||
(last_value instanceof VString &&
((VString) last_value).getAlarm().getSeverity() != severity))
(last_value instanceof VString vString &&
vString.getAlarm().getSeverity() != severity))
g.writeStringField("severity", value.getAlarm().getSeverity().name());

g.writeStringField("text", value.getValue());
Expand Down Expand Up @@ -176,8 +176,8 @@ private static void handleNumber(final JsonGenerator g, final VNumber value, fin
else
{
// Add severity if it changed
if ((last_value instanceof VNumber) &&
((VNumber) last_value).getAlarm().getSeverity() != severity)
if ((last_value instanceof VNumber vNumber) &&
vNumber.getAlarm().getSeverity() != severity)
g.writeStringField("severity", severity.name());
}

Expand Down Expand Up @@ -208,8 +208,8 @@ private static void handleDoubles(final JsonGenerator g, final VNumberArray valu
else
{
// Add severity if it changed
if ((last_value instanceof VNumber) &&
((VNumber) last_value).getAlarm().getSeverity() != severity)
if ((last_value instanceof VNumber vNumber) &&
vNumber.getAlarm().getSeverity() != severity)
g.writeStringField("severity", severity.name());
}

Expand Down Expand Up @@ -240,8 +240,8 @@ private static void handleInts(final JsonGenerator g, final VNumberArray value,
else
{
// Add severity if it changed
if ((last_value instanceof VNumber) &&
((VNumber) last_value).getAlarm().getSeverity() != severity)
if ((last_value instanceof VNumber vNumber) &&
vNumber.getAlarm().getSeverity() != severity)
g.writeStringField("severity", severity.name());
}

Expand Down Expand Up @@ -277,8 +277,8 @@ private static void handleEnum(final JsonGenerator g, final VEnum value, final V
else
{
// Add severity if it changed
if ((last_value instanceof VNumber) &&
((VNumber) last_value).getAlarm().getSeverity() != severity)
if ((last_value instanceof VNumber vNumber) &&
vNumber.getAlarm().getSeverity() != severity)
g.writeStringField("severity", severity.name());
}

Expand All @@ -300,8 +300,8 @@ private static void handleFloats(final JsonGenerator g, final VNumberArray value
else
{
// Add severity if it changed
if ((last_value instanceof VNumber) &&
((VNumber) last_value).getAlarm().getSeverity() != severity)
if ((last_value instanceof VNumber vNumber) &&
vNumber.getAlarm().getSeverity() != severity)
g.writeStringField("severity", severity.name());
}

Expand Down Expand Up @@ -329,8 +329,8 @@ private static void handleShorts(final JsonGenerator g, final VNumberArray value
else
{
// Add severity if it changed
if ((last_value instanceof VNumber) &&
((VNumber) last_value).getAlarm().getSeverity() != severity)
if ((last_value instanceof VNumber vNumber) &&
vNumber.getAlarm().getSeverity() != severity)
g.writeStringField("severity", severity.name());
}

Expand Down Expand Up @@ -358,8 +358,8 @@ private static void handleBytes(final JsonGenerator g, final VNumberArray value,
else
{
// Add severity if it changed
if ((last_value instanceof VNumber) &&
((VNumber) last_value).getAlarm().getSeverity() != severity)
if ((last_value instanceof VNumber vNumber) &&
vNumber.getAlarm().getSeverity() != severity)
g.writeStringField("severity", severity.name());
}

Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/phoebus/pvws/ws/WebSocketPV.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2019-2022 UT-Battelle, LLC.
* Copyright (c) 2019-2026 UT-Battelle, LLC.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the LICENSE
* which accompanies this distribution
Expand Down Expand Up @@ -107,7 +107,7 @@ public void start() throws Exception
*/
private void handleUpdates(final VType value)
{
if (value instanceof Array && !subscribed_for_array)
if (value instanceof Array array && !subscribed_for_array)
{
// If the data turns out to be array values,
// re-subscribe at a (slower) 'array' rate.
Expand All @@ -116,7 +116,6 @@ private void handleUpdates(final VType value)
// so we won't be able to cancel that subscription right away.
// Instead, we'll create a separate 'array_subscription',
// and in a later update we then dispose the initial subscription.
final Array array = (Array) value;
logger.log(Level.FINE, () -> "Re-subscribing to array " + name + ", " + array.getSizes());

subscribed_for_array = true;
Expand Down
Loading