You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/07/25 19:42:02 UTC
[4/6] karaf git commit: Rename BundleInstallSupport#saveState() to
saveDigraph()
Rename BundleInstallSupport#saveState() to saveDigraph()
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/1c21e522
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/1c21e522
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/1c21e522
Branch: refs/heads/master
Commit: 1c21e522bebb35b25321e06528f595b79670f527
Parents: c4a4de2
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Jul 24 22:47:45 2017 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Tue Jul 25 21:40:14 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/karaf/features/internal/osgi/Activator.java | 4 ++--
.../karaf/features/internal/service/BundleInstallSupport.java | 2 +-
.../features/internal/service/BundleInstallSupportImpl.java | 4 ++--
.../karaf/features/internal/service/FeaturesServiceImpl.java | 2 +-
.../karaf/features/internal/service/StaticInstallSupport.java | 2 +-
.../karaf/features/internal/service/FeaturesServiceImplTest.java | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/1c21e522/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java b/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java
index b3ec0a1..876ec8e 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java
@@ -139,7 +139,7 @@ public class Activator extends BaseActivator {
systemBundleContext,
configInstaller,
dg);
- register(RegionDigraphPersistence.class, () -> installSupport.saveState());
+ register(RegionDigraphPersistence.class, () -> installSupport.saveDigraph());
FeatureRepoFinder featureFinder = new FeatureRepoFinder();
register(ManagedService.class, featureFinder, FeatureRepoFinder.getServiceProperties());
@@ -302,7 +302,7 @@ public class Activator extends BaseActivator {
featuresService = null;
}
if (installSupport != null) {
- installSupport.saveState();
+ installSupport.saveDigraph();
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/1c21e522/features/core/src/main/java/org/apache/karaf/features/internal/service/BundleInstallSupport.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/BundleInstallSupport.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/BundleInstallSupport.java
index 6c26d14..8b0ffc4 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/BundleInstallSupport.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/BundleInstallSupport.java
@@ -58,7 +58,7 @@ public interface BundleInstallSupport {
Map<String, Set<Long>> bundles)
throws BundleException, InvalidSyntaxException;
- void saveState();
+ void saveDigraph();
RegionDigraph getDiGraphCopy() throws BundleException;
http://git-wip-us.apache.org/repos/asf/karaf/blob/1c21e522/features/core/src/main/java/org/apache/karaf/features/internal/service/BundleInstallSupportImpl.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/BundleInstallSupportImpl.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/BundleInstallSupportImpl.java
index 562425f..ae9a406 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/BundleInstallSupportImpl.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/BundleInstallSupportImpl.java
@@ -279,10 +279,10 @@ public class BundleInstallSupportImpl implements BundleInstallSupport {
}
/* (non-Javadoc)
- * @see org.apache.karaf.features.internal.service.Regions#saveState()
+ * @see org.apache.karaf.features.internal.service.Regions#saveDigraph()
*/
@Override
- public void saveState() {
+ public void saveDigraph() {
DigraphHelper.saveDigraph(getDataFile(DigraphHelper.DIGRAPH_FILE), digraph);
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/1c21e522/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
index 9600f11..e5a8b54 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
@@ -218,7 +218,7 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall
state.bundleChecksums.clear();
}
storage.save(state);
- installSupport.saveState();
+ installSupport.saveDigraph();
}
} catch (IOException e) {
LOGGER.warn("Error saving FeaturesService state", e);
http://git-wip-us.apache.org/repos/asf/karaf/blob/1c21e522/features/core/src/main/java/org/apache/karaf/features/internal/service/StaticInstallSupport.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/StaticInstallSupport.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/StaticInstallSupport.java
index 2936b46..eaecccb 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/StaticInstallSupport.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/StaticInstallSupport.java
@@ -74,7 +74,7 @@ public abstract class StaticInstallSupport implements BundleInstallSupport {
}
@Override
- public void saveState() {
+ public void saveDigraph() {
}
@Override
http://git-wip-us.apache.org/repos/asf/karaf/blob/1c21e522/features/core/src/test/java/org/apache/karaf/features/internal/service/FeaturesServiceImplTest.java
----------------------------------------------------------------------
diff --git a/features/core/src/test/java/org/apache/karaf/features/internal/service/FeaturesServiceImplTest.java b/features/core/src/test/java/org/apache/karaf/features/internal/service/FeaturesServiceImplTest.java
index b6dc70a..01ad34b 100644
--- a/features/core/src/test/java/org/apache/karaf/features/internal/service/FeaturesServiceImplTest.java
+++ b/features/core/src/test/java/org/apache/karaf/features/internal/service/FeaturesServiceImplTest.java
@@ -226,7 +226,7 @@ public class FeaturesServiceImplTest extends TestBase {
}
@Override
- protected void saveState() {
+ protected void saveDigraph() {
}