CORE-13335: Fix linting errors

Author: Sam Raeburn

examples/connext_dds/keyed_data/c++11/keys_subscriber.cxx

@@ -34,23 +34,26 @@ int process_data(dds::sub::DataReader<keys> reader)
             std::cout << "Instance " << sample.data().code()
                       << ", x: " << sample.data().x()
                       << ", y: " << sample.data().y() << std::endl;
-        } else {        
+        } else {
             // A sample without valid data can be in any instance state, but the
             // key value is only available if it is ALIVE or NOT_ALIVE_DISPOSED
             const dds::sub::status::InstanceState &state =
                     info.state().instance_state();
-            if (state == dds::sub::status::InstanceState::not_alive_no_writers()) {
-                std::cout << "Instance is in NOT_ALIVE_NO_WRITERS instance state"
-                          << std::endl;
+            if (state
+                    == dds::sub::status::InstanceState::not_alive_no_writers()) {
+                std::cout
+                        << "Instance is in NOT_ALIVE_NO_WRITERS instance state"
+                        << std::endl;
             } else {
                 // Since there is not valid data, it may include metadata.
                 keys sample;
                 reader.key_value(sample, info.instance_handle());
-                std::cout << "Instance " << sample.code() << " is " <<
-                        ((state == dds::sub::status::InstanceState::not_alive_disposed())
-                                ? "disposed "
-                                : "alive ")
-                                        << std::endl;
+                std::cout << "Instance " << sample.code() << " is "
+                        << ((state
+                            == dds::sub::status::InstanceState::alive())
+                                ? "alive"
+                                : "disposed")
+                        << std::endl;
             }
         }
 

examples/connext_dds/keyed_data/c++98/keys_subscriber.cxx

@@ -59,7 +59,8 @@ unsigned int process_data(keysDataReader *typed_reader)
              * An invalid sample can be in any instance state. The key value is
              * only available if it is ALIVE or NOT_ALIVE_DISPOSED.
              */
-            if (info_seq[i].instance_state == DDS_NOT_ALIVE_NO_WRITERS_INSTANCE_STATE) {
+            if (info_seq[i].instance_state
+                == DDS_NOT_ALIVE_NO_WRITERS_INSTANCE_STATE) {
                 std::cout << "Instance has no writers" << std::endl;
             } else {
                 keys dummy;
@@ -71,9 +72,10 @@ unsigned int process_data(keysDataReader *typed_reader)
                     continue;
                 }
                 std::cout << "Instance " << dummy.code << " is "
-                        << ((info_seq[i].instance_state == DDS_ALIVE_INSTANCE_STATE)
-                                ? "alive"
-                                : "disposed")
+                        << ((info_seq[i].instance_state
+                            == DDS_ALIVE_INSTANCE_STATE)
+                                    ? "alive"
+                                    : "disposed")
                         << std::endl;
             }
         }

examples/connext_dds/keyed_data/c/keys_subscriber.c

@@ -149,12 +149,13 @@ void keysListener_on_data_available(void *listener_data, DDS_DataReader *reader)
 
         } else {
             printf("No valid data for sample\n");
-            /* 
+            /*
              * An invalid data sample can be in any instance state. The key
              * value may be available if the instance is either ALIVE or
              * NOT_ALIVE_DISPOSED.
              */
-            if (info->instance_state == DDS_NOT_ALIVE_NO_WRITERS_INSTANCE_STATE) {
+            if (info->instance_state
+                == DDS_NOT_ALIVE_NO_WRITERS_INSTANCE_STATE) {
                 printf("Instance is in NOT_ALIVE_NO_WRITERS instance state\n");
             } else {
                 keys key_value;
@@ -166,11 +167,12 @@ void keysListener_on_data_available(void *listener_data, DDS_DataReader *reader)
                     printf("get_key_value error %d\n", retcode);
                     continue;
                 }
-                printf("Instance %d is in %s instance state\n",
+                printf(
+                        "Instance %d is in %s instance state\n",
                         key_value.code,
-                        info->instance_state == DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE
-                                ? "NOT_ALIVE_DISPOSED"
-                                : "ALIVE");
+                        ((info->instance_state == DDS_ALIVE_INSTANCE_STATE)
+                                ? "ALIVE"
+                                : "NOT_ALIVE_DISPOSED"));
             }
         }
         /* End changes for Keyed_Data */

examples/connext_dds/keyed_data/java/keysSubscriber.java

@@ -67,18 +67,22 @@ private int processData()
                             "Instance " + sample.code + ": x: " + sample.x
                             + ", y: " + sample.y + "\n");
                 } else {
-                    if (info.instance_state ==
-                            InstanceStateKind.NOT_ALIVE_NO_WRITERS_INSTANCE_STATE) {
+                    if (info.instance_state
+                            == InstanceStateKind
+                                    .NOT_ALIVE_NO_WRITERS_INSTANCE_STATE) {
                         System.out.print("Instance has no writers\n");
                     } else {
                         keys dummy = new keys();
                         reader.get_key_value(dummy, info.instance_handle);
-                        if (info.instance_state ==
-                                InstanceStateKind.ALIVE_INSTANCE_STATE) {
-                            System.out.print("Instance " + dummy.code + " is ALIVE\n");
-                        } else if (info.instance_state ==
-                                InstanceStateKind.NOT_ALIVE_DISPOSED_INSTANCE_STATE) {
-                            System.out.print("Instance " + dummy.code + " is disposed\n");
+                        if (info.instance_state
+                                == InstanceStateKind.ALIVE_INSTANCE_STATE) {
+                            System.out.print(
+                                    "Instance " + dummy.code + " is ALIVE\n");
+                        } else if (info.instance_state
+                                == InstanceStateKind.NOT_ALIVE_DISPOSED_INSTANCE_STATE) {
+                            System.out.print(
+                                    "Instance " + dummy.code
+                                    + " is disposed\n");
                         }
                     }
                 }