Ditch blueprint from srm-impl 55/97755/2
authorRobert Varga <robert.varga@pantheon.tech>
Tue, 5 Oct 2021 18:06:01 +0000 (20:06 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Thu, 7 Oct 2021 09:17:32 +0000 (11:17 +0200)
commit7f4d52581b7cabb763aaa536491a79691a5e846b
treeedcc88fb11a05da6dfafba609ae870e9c2e3230f
parentd22df7c373b39ab39b1dc6c4a5aefed601c2f717
Ditch blueprint from srm-impl

We are using a dead plugin to generate half of wiring, with the rest
hand-written. Convert to OSGi DS, noticing a private method, which
really should be part of interface (in keeping with others).

This also fixes a TOCTOU race in removeRecoverableListener(), which
could lead to NPEs.

Since we are now SCR-enabled, we can ditch the use of ODL blueprint
extensions in shell, making everyone a bit happier.

Change-Id: Ia9d4d0fc3f0bc430d3a106f53975ab7d6e1241d0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
13 files changed:
srm/api/pom.xml
srm/api/src/main/java/org/opendaylight/serviceutils/srm/ServiceRecoveryRegistry.java
srm/impl/pom.xml
srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/ServiceRecoveryListener.java
srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/ServiceRecoveryManager.java [deleted file]
srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/ServiceRecoveryRegistryImpl.java
srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/SrmRpcProvider.java
srm/impl/src/main/resources/OSGI-INF/blueprint/srm.xml [deleted file]
srm/shell/pom.xml
srm/shell/src/main/java/org/opendaylight/serviceutils/srm/shell/RecoverCommand.java
srm/shell/src/main/java/org/opendaylight/serviceutils/srm/shell/ReinstallCommand.java
srm/shell/src/main/java/org/opendaylight/serviceutils/srm/shell/SrmDebugCommand.java
srm/shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml