You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/12/03 12:04:01 UTC
ignite git commit: review
Repository: ignite
Updated Branches:
refs/heads/ignite-1270 d46071953 -> 4dea7bc48
review
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4dea7bc4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4dea7bc4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4dea7bc4
Branch: refs/heads/ignite-1270
Commit: 4dea7bc4866406b805d5ab9087ab9bf77d66ba47
Parents: d460719
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Dec 3 14:03:42 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Dec 3 14:03:42 2015 +0300
----------------------------------------------------------------------
.../IgniteAbstractOsgiContextActivator.java | 78 +++++++++++---------
.../org/apache/ignite/osgi/IgniteOsgiUtils.java | 4 -
.../BundleDelegatingClassLoader.java | 41 ++++------
.../classloaders/ContainerSweepClassLoader.java | 9 +--
.../OsgiClassLoadingStrategyType.java | 2 -
.../ignite/osgi/AbstractIgniteKarafTest.java | 2 -
.../IgniteKarafFeaturesInstallationTest.java | 8 +-
.../ignite/osgi/IgniteOsgiServiceTest.java | 10 +--
.../apache/ignite/osgi/IgniteOsgiTestSuite.java | 2 +-
.../activators/BasicIgniteTestActivator.java | 4 +-
10 files changed, 67 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4dea7bc4/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteAbstractOsgiContextActivator.java
----------------------------------------------------------------------
diff --git a/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteAbstractOsgiContextActivator.java b/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteAbstractOsgiContextActivator.java
index 8fea896..c83c40d 100644
--- a/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteAbstractOsgiContextActivator.java
+++ b/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteAbstractOsgiContextActivator.java
@@ -19,17 +19,16 @@ package org.apache.ignite.osgi;
import java.util.Dictionary;
import java.util.Hashtable;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.Ignition;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.osgi.classloaders.BundleDelegatingClassLoader;
import org.apache.ignite.osgi.classloaders.ContainerSweepClassLoader;
import org.apache.ignite.osgi.classloaders.OsgiClassLoadingStrategyType;
-
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
@@ -59,7 +58,6 @@ import org.osgi.framework.BundleContext;
*
*/
public abstract class IgniteAbstractOsgiContextActivator implements BundleActivator {
-
/** OSGI service property name. */
public static final String OSGI_SERVICE_PROP_IGNITE_NAME = "ignite.name";
@@ -67,49 +65,49 @@ public abstract class IgniteAbstractOsgiContextActivator implements BundleActiva
protected Ignite ignite;
/** Our bundle context. */
- private BundleContext bundleContext;
+ private BundleContext bundleCtx;
/** Ignite logger. */
- private IgniteLogger logger;
+ private IgniteLogger log;
/**
* Method invoked by OSGi to start the bundle. It starts the specified Ignite configuration.
*
- * @param context Bundle context.
+ * @param ctx Bundle context.
* @throws Exception
*/
- @Override public final void start(BundleContext context) throws Exception {
+ @Override public final void start(BundleContext ctx) throws Exception {
// Ensure that no other instances are running.
if (IgniteOsgiUtils.gridCount() > 0) {
throw new IgniteException("Failed to start Ignite instance (another instance is already running " +
"and ignite-osgi is currently limited to a single instance per container).");
}
- bundleContext = context;
+ bundleCtx = ctx;
// Start the Ignite configuration specified by the user.
- IgniteConfiguration config = igniteConfiguration();
+ IgniteConfiguration cfg = igniteConfiguration();
- A.notNull(config, "Ignite configuration cannot be null");
+ A.notNull(cfg, "Ignite configuration");
// Override the classloader with the classloading strategy chosen by the user.
ClassLoader clsLdr;
if (classLoadingStrategy() == OsgiClassLoadingStrategyType.BUNDLE_DELEGATING)
- clsLdr = new BundleDelegatingClassLoader(bundleContext.getBundle(), Ignite.class.getClassLoader());
+ clsLdr = new BundleDelegatingClassLoader(bundleCtx.getBundle(), Ignite.class.getClassLoader());
else
- clsLdr = new ContainerSweepClassLoader(bundleContext.getBundle(), Ignite.class.getClassLoader());
+ clsLdr = new ContainerSweepClassLoader(bundleCtx.getBundle(), Ignite.class.getClassLoader());
- config.setClassLoader(clsLdr);
+ cfg.setClassLoader(clsLdr);
- preStart(context);
+ preStart(ctx);
// Start Ignite.
- ignite = Ignition.start(config);
+ ignite = Ignition.start(cfg);
- logger = ignite.log();
+ log = ignite.log();
- logger.info("Started Ignite from OSGi Activator [name=" + ignite.name() + ']');
+ log.info("Started Ignite from OSGi Activator [name=" + ignite.name() + ']');
// Add into Ignite's OSGi registry.
IgniteOsgiUtils.classloaders().put(ignite, clsLdr);
@@ -117,15 +115,14 @@ public abstract class IgniteAbstractOsgiContextActivator implements BundleActiva
// Export Ignite as a service.
exportOsgiService(ignite);
- postStart(context);
-
+ postStart(ctx);
}
/**
* Stops Ignite when the bundle is stopping.
*
* @param context Bundle context.
- * @throws Exception
+ * @throws Exception If failed.
*/
@Override public final void stop(BundleContext context) throws Exception {
preStop(context);
@@ -134,11 +131,13 @@ public abstract class IgniteAbstractOsgiContextActivator implements BundleActiva
ignite.close();
}
catch (Exception e) {
- logger.error("Failed to stop Ignite via OSGi Activator [errMsg=" + e.getMessage() + ']');
+ U.error(log, "Failed to stop Ignite via OSGi Activator [errMsg=" + e.getMessage() + ']', e);
+
return;
}
- logger.info("Stopped Ignite from OSGi Activator [name=" + ignite.name() + ']');
+ if (log.isInfoEnabled())
+ log.info("Stopped Ignite from OSGi Activator [name=" + ignite.name() + ']');
IgniteOsgiUtils.classloaders().remove(ignite);
@@ -150,36 +149,43 @@ public abstract class IgniteAbstractOsgiContextActivator implements BundleActiva
* <p>
* The default implementation is empty. Override it to introduce custom logic.
*
- * @param context The {@link BundleContext}.
+ * @param ctx The {@link BundleContext}.
*/
- private void preStart(BundleContext context) { }
+ private void preStart(BundleContext ctx) {
+ // No-op.
+ }
/**
* This method is called after Ignite initialises, only if initialization succeeded.
* <p>
* The default implementation is empty. Override it to introduce custom logic.
*
- * @param context The {@link BundleContext}.
+ * @param ctx The {@link BundleContext}.
*/
- private void postStart(BundleContext context) { }
+ private void postStart(BundleContext ctx) {
+ // No-op.
+ }
/**
* This method is called before Ignite stops.
* <p>
* The default implementation is empty. Override it to introduce custom logic.
*
- * @param context The {@link BundleContext}.
+ * @param ctx The {@link BundleContext}.
*/
- private void preStop(BundleContext context) { }
+ private void preStop(BundleContext ctx) {
+ // No-op.
+ }
/**
* This method is called after Ignite stops, only if the operation succeeded.
* <p>
* The default implementation is empty. Override it to introduce custom logic.
*
- * @param context The {@link BundleContext}.
+ * @param ctx The {@link BundleContext}.
*/
- private void postStop(BundleContext context) {
+ private void postStop(BundleContext ctx) {
+ // No-op.
}
/**
@@ -200,19 +206,19 @@ public abstract class IgniteAbstractOsgiContextActivator implements BundleActiva
/**
* Exports the Ignite instance onto the OSGi Service Registry.
- * @param ignite
+ *
+ * @param ignite Ignite.
*/
private void exportOsgiService(Ignite ignite) {
Dictionary<String, String> dict = new Hashtable<>();
// Only add the service property if the grid name != null.
- if (ignite.name() != null) {
+ if (ignite.name() != null)
dict.put(OSGI_SERVICE_PROP_IGNITE_NAME, ignite.name());
- }
- bundleContext.registerService(Ignite.class, ignite, dict);
+ bundleCtx.registerService(Ignite.class, ignite, dict);
- logger.info("Exported OSGi service for Ignite with properties " + dict);
+ if (log.isInfoEnabled())
+ log.info("Exported OSGi service for Ignite with properties: " + dict);
}
-
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4dea7bc4/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteOsgiUtils.java
----------------------------------------------------------------------
diff --git a/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteOsgiUtils.java b/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteOsgiUtils.java
index 6199285..deda3e8 100644
--- a/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteOsgiUtils.java
+++ b/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteOsgiUtils.java
@@ -19,9 +19,7 @@ package org.apache.ignite.osgi;
import java.util.Map;
import java.util.concurrent.ConcurrentMap;
-
import org.apache.ignite.Ignite;
-
import org.jsr166.ConcurrentHashMap8;
import org.osgi.framework.Bundle;
import org.osgi.framework.FrameworkUtil;
@@ -30,7 +28,6 @@ import org.osgi.framework.FrameworkUtil;
* Helper class for OSGi.
*/
public class IgniteOsgiUtils {
-
/** Whether we are running in an OSGi container. */
private static boolean osgi = FrameworkUtil.getBundle(IgniteOsgiUtils.class) != null;
@@ -69,5 +66,4 @@ public class IgniteOsgiUtils {
public static int gridCount() {
return CLASSLOADERS.size();
}
-
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4dea7bc4/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/BundleDelegatingClassLoader.java
----------------------------------------------------------------------
diff --git a/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/BundleDelegatingClassLoader.java b/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/BundleDelegatingClassLoader.java
index 3a71819..07c0682 100644
--- a/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/BundleDelegatingClassLoader.java
+++ b/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/BundleDelegatingClassLoader.java
@@ -20,9 +20,8 @@ package org.apache.ignite.osgi.classloaders;
import java.io.IOException;
import java.net.URL;
import java.util.Enumeration;
-
-import org.apache.ignite.internal.util.typedef.internal.SB;
-
+import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
import org.osgi.framework.Bundle;
/**
@@ -30,11 +29,11 @@ import org.osgi.framework.Bundle;
* as a fallback.
*/
public class BundleDelegatingClassLoader extends ClassLoader {
-
/** The bundle which loaded Ignite. */
protected final Bundle bundle;
/** The fallback classloader, expected to be the ignite-core classloader. */
+ @GridToStringExclude
protected final ClassLoader clsLdr;
/**
@@ -57,19 +56,13 @@ public class BundleDelegatingClassLoader extends ClassLoader {
this.clsLdr = classLoader;
}
- /**
- * {@inheritDoc}
- */
- @Override
- protected Class<?> findClass(String name) throws ClassNotFoundException {
+ /** {@inheritDoc} */
+ @Override protected Class<?> findClass(String name) throws ClassNotFoundException {
return bundle.loadClass(name);
}
- /**
- * {@inheritDoc}
- */
- @Override
- protected URL findResource(String name) {
+ /** {@inheritDoc} */
+ @Override protected URL findResource(String name) {
URL resource = bundle.getResource(name);
if (resource == null && clsLdr != null)
@@ -98,8 +91,7 @@ public class BundleDelegatingClassLoader extends ClassLoader {
* @return The Class.
* @throws ClassNotFoundException
*/
- @Override
- protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+ @Override protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
Class<?> cls;
try {
@@ -133,12 +125,9 @@ public class BundleDelegatingClassLoader extends ClassLoader {
return bundle;
}
- /**
- * {@inheritDoc}
- */
- @Override
- public String toString() {
- return String.format("%s[%s]", getClass().getSimpleName(), bundle);
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(BundleDelegatingClassLoader.class, this);
}
/**
@@ -148,10 +137,10 @@ public class BundleDelegatingClassLoader extends ClassLoader {
* @return The exception.
*/
protected ClassNotFoundException classNotFoundException(String clsName) {
- String s = new SB("Failed to resolve class [name=").a(clsName)
- .a(", bundleId=").a(bundle.getBundleId())
- .a(", symbolicName=").a(bundle.getSymbolicName())
- .a(", fallbackClsLdr=").a(clsLdr).a("]").toString();
+ String s = "Failed to resolve class [name=" + clsName +
+ ", bundleId=" + bundle.getBundleId() +
+ ", symbolicName=" + bundle.getSymbolicName() +
+ ", fallbackClsLdr=" + clsLdr + ']';
return new ClassNotFoundException(s);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4dea7bc4/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/ContainerSweepClassLoader.java
----------------------------------------------------------------------
diff --git a/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/ContainerSweepClassLoader.java b/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/ContainerSweepClassLoader.java
index ed3c200..e2e773a 100644
--- a/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/ContainerSweepClassLoader.java
+++ b/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/ContainerSweepClassLoader.java
@@ -19,9 +19,7 @@ package org.apache.ignite.osgi.classloaders;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
-
import org.apache.ignite.internal.util.GridConcurrentHashSet;
-
import org.jsr166.ConcurrentHashMap8;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
@@ -33,7 +31,6 @@ import org.osgi.framework.Constants;
* It keeps a cache of resolved classes and unresolvable classes, in order to optimize subsequent lookups.
*/
public class ContainerSweepClassLoader extends BundleDelegatingClassLoader {
-
/** Classes resolved previously. */
private final ConcurrentMap<String, Bundle> resolved = new ConcurrentHashMap8<>();
@@ -68,8 +65,7 @@ public class ContainerSweepClassLoader extends BundleDelegatingClassLoader {
* @return The loaded class.
* @throws ClassNotFoundException
*/
- @Override
- protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+ @Override protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
// If we know it's not resolvable, throw the exception immediately.
if (nonResolvable.contains(name))
throw classNotFoundException(name);
@@ -124,7 +120,7 @@ public class ContainerSweepClassLoader extends BundleDelegatingClassLoader {
break;
}
catch (ClassNotFoundException e) {
- continue;
+ // No-op.
}
}
@@ -135,5 +131,4 @@ public class ContainerSweepClassLoader extends BundleDelegatingClassLoader {
return cls;
}
-
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4dea7bc4/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/OsgiClassLoadingStrategyType.java
----------------------------------------------------------------------
diff --git a/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/OsgiClassLoadingStrategyType.java b/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/OsgiClassLoadingStrategyType.java
index 939aca7..9afde42 100644
--- a/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/OsgiClassLoadingStrategyType.java
+++ b/modules/osgi/src/main/java/org/apache/ignite/osgi/classloaders/OsgiClassLoadingStrategyType.java
@@ -21,11 +21,9 @@ package org.apache.ignite.osgi.classloaders;
* Enum for the user to indicate which type of {@link ClassLoader} Ignite should use.
*/
public enum OsgiClassLoadingStrategyType {
-
/** Use this value for {@link BundleDelegatingClassLoader}. */
BUNDLE_DELEGATING,
/** Use this value for {@link ContainerSweepClassLoader}. */
CONTAINER_SWEEP
-
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4dea7bc4/modules/osgi/src/test/java/org/apache/ignite/osgi/AbstractIgniteKarafTest.java
----------------------------------------------------------------------
diff --git a/modules/osgi/src/test/java/org/apache/ignite/osgi/AbstractIgniteKarafTest.java b/modules/osgi/src/test/java/org/apache/ignite/osgi/AbstractIgniteKarafTest.java
index d2d2e43..786b543 100644
--- a/modules/osgi/src/test/java/org/apache/ignite/osgi/AbstractIgniteKarafTest.java
+++ b/modules/osgi/src/test/java/org/apache/ignite/osgi/AbstractIgniteKarafTest.java
@@ -50,7 +50,6 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerMethod.class)
public abstract class AbstractIgniteKarafTest {
-
/** Features we do not expect to be installed. */
protected static final Set<String> IGNORED_FEATURES = new HashSet<>(
Arrays.asList("ignite-log4j", "ignite-scalar-2.10"));
@@ -107,5 +106,4 @@ public abstract class AbstractIgniteKarafTest {
}
protected abstract List<String> featuresToInstall();
-
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4dea7bc4/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
----------------------------------------------------------------------
diff --git a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
index 08d105a..c0eb06b 100644
--- a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
+++ b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteKarafFeaturesInstallationTest.java
@@ -20,9 +20,7 @@ package org.apache.ignite.osgi;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-
import org.apache.karaf.features.Feature;
-
import org.junit.Test;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.CoreOptions;
@@ -39,7 +37,6 @@ import static org.junit.Assert.assertTrue;
* Pax Exam test class to check if all features could be resolved and installed.
*/
public class IgniteKarafFeaturesInstallationTest extends AbstractIgniteKarafTest {
-
/** Number of features expected to exist. */
private static final int EXPECTED_FEATURES = 25;
@@ -95,10 +92,9 @@ public class IgniteKarafFeaturesInstallationTest extends AbstractIgniteKarafTest
}
/**
- * @return
+ * @return Features list.
*/
- @Override
- protected List<String> featuresToInstall() {
+ @Override protected List<String> featuresToInstall() {
return Arrays.asList("ignite-all");
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4dea7bc4/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
----------------------------------------------------------------------
diff --git a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
index 1d348ab..2cb8838 100644
--- a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
+++ b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiServiceTest.java
@@ -21,10 +21,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.inject.Inject;
-
import org.apache.ignite.Ignite;
import org.apache.ignite.osgi.activators.BasicIgniteTestActivator;
-
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
@@ -48,13 +46,12 @@ import static org.ops4j.pax.tinybundles.core.TinyBundles.withBnd;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerMethod.class)
public class IgniteOsgiServiceTest extends AbstractIgniteKarafTest {
-
/** Injects the Ignite OSGi service. */
@Inject @Filter("(ignite.name=testGrid)")
private Ignite ignite;
/**
- * @return
+ * @return Config.
*/
@Configuration
public Option[] bundleDelegatingConfig() {
@@ -73,7 +70,7 @@ public class IgniteOsgiServiceTest extends AbstractIgniteKarafTest {
}
/**
- * @throws Exception
+ * @throws Exception If failed.
*/
@Test
public void testServiceExposed() throws Exception {
@@ -82,10 +79,9 @@ public class IgniteOsgiServiceTest extends AbstractIgniteKarafTest {
}
/**
- * @return
+ * @return Features.
*/
@Override protected List<String> featuresToInstall() {
return Arrays.asList("ignite-core");
}
-
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4dea7bc4/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiTestSuite.java b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiTestSuite.java
index 7c8b852..0a3d69c 100644
--- a/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiTestSuite.java
+++ b/modules/osgi/src/test/java/org/apache/ignite/osgi/IgniteOsgiTestSuite.java
@@ -28,5 +28,5 @@ import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses({IgniteOsgiServiceTest.class, IgniteKarafFeaturesInstallationTest.class})
public class IgniteOsgiTestSuite {
-
+ // No-op.
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4dea7bc4/modules/osgi/src/test/java/org/apache/ignite/osgi/activators/BasicIgniteTestActivator.java
----------------------------------------------------------------------
diff --git a/modules/osgi/src/test/java/org/apache/ignite/osgi/activators/BasicIgniteTestActivator.java b/modules/osgi/src/test/java/org/apache/ignite/osgi/activators/BasicIgniteTestActivator.java
index 13623bc..a74ee87 100644
--- a/modules/osgi/src/test/java/org/apache/ignite/osgi/activators/BasicIgniteTestActivator.java
+++ b/modules/osgi/src/test/java/org/apache/ignite/osgi/activators/BasicIgniteTestActivator.java
@@ -27,7 +27,7 @@ import org.apache.ignite.osgi.classloaders.OsgiClassLoadingStrategyType;
public class BasicIgniteTestActivator extends IgniteAbstractOsgiContextActivator {
/**
- * @return
+ * @return Ignite config.
*/
@Override public IgniteConfiguration igniteConfiguration() {
IgniteConfiguration config = new IgniteConfiguration();
@@ -38,7 +38,7 @@ public class BasicIgniteTestActivator extends IgniteAbstractOsgiContextActivator
}
/**
- * @return
+ * @return Strategy.
*/
@Override public OsgiClassLoadingStrategyType classLoadingStrategy() {
return OsgiClassLoadingStrategyType.BUNDLE_DELEGATING;