@@ -117,35 +117,26 @@ public MLStatsInput() {
117117 }
118118
119119 public MLStatsInput (StreamInput input ) throws IOException {
120- targetStatLevels = input .readBoolean () ? input . readEnumSet ( MLStatLevel . class ) : EnumSet . noneOf (MLStatLevel .class );
121- clusterLevelStats = input .readBoolean () ? input . readEnumSet ( MLClusterLevelStat . class ) : EnumSet . noneOf (MLClusterLevelStat .class );
122- nodeLevelStats = input .readBoolean () ? input . readEnumSet ( MLNodeLevelStat . class ) : EnumSet . noneOf (MLNodeLevelStat .class );
123- actionLevelStats = input .readBoolean () ? input . readEnumSet ( MLActionLevelStat . class ) : EnumSet . noneOf (MLActionLevelStat .class );
120+ targetStatLevels = input .readOptionalEnumSet (MLStatLevel .class );
121+ clusterLevelStats = input .readOptionalEnumSet (MLClusterLevelStat .class );
122+ nodeLevelStats = input .readOptionalEnumSet (MLNodeLevelStat .class );
123+ actionLevelStats = input .readOptionalEnumSet (MLActionLevelStat .class );
124124 nodeIds = input .readBoolean () ? new HashSet <>(input .readStringList ()) : new HashSet <>();
125125 models = input .readBoolean () ? new HashSet <>(input .readStringList ()) : new HashSet <>();
126- algorithms = input .readBoolean () ? input . readEnumSet ( FunctionName . class ) : EnumSet . noneOf (FunctionName .class );
127- actions = input .readBoolean () ? input . readEnumSet ( ActionName . class ) : EnumSet . noneOf (ActionName .class );
126+ algorithms = input .readOptionalEnumSet (FunctionName .class );
127+ actions = input .readOptionalEnumSet (ActionName .class );
128128 }
129129
130130 @ Override
131131 public void writeTo (StreamOutput out ) throws IOException {
132- writeEnumSet ( out , targetStatLevels );
133- writeEnumSet ( out , clusterLevelStats );
134- writeEnumSet ( out , nodeLevelStats );
135- writeEnumSet ( out , actionLevelStats );
132+ out . writeOptionalEnumSet ( targetStatLevels );
133+ out . writeOptionalEnumSet ( clusterLevelStats );
134+ out . writeOptionalEnumSet ( nodeLevelStats );
135+ out . writeOptionalEnumSet ( actionLevelStats );
136136 out .writeOptionalStringCollection (nodeIds );
137137 out .writeOptionalStringCollection (models );
138- writeEnumSet (out , algorithms );
139- writeEnumSet (out , actions );
140- }
141-
142- private void writeEnumSet (StreamOutput out , EnumSet <?> set ) throws IOException {
143- if (set != null && set .size () > 0 ) {
144- out .writeBoolean (true );
145- out .writeEnumSet (set );
146- } else {
147- out .writeBoolean (false );
148- }
138+ out .writeOptionalEnumSet (algorithms );
139+ out .writeOptionalEnumSet (actions );
149140 }
150141
151142 public static MLStatsInput parse (XContentParser parser ) throws IOException {
0 commit comments