Repository: incubator-ignite Updated Branches: refs/heads/master 27c89dec0 -> c6781a1c0
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f809796/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java index db1ae2f..3fb43a5 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java @@ -51,7 +51,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { private static final long RETRY_TIMEOUT = 1000; /** Local service instances. */ - private final Map<String, Collection<GridServiceContextImpl>> locSvcs = new HashMap<>(); + private final Map<String, Collection<ManagedServiceContextImpl>> locSvcs = new HashMap<>(); /** Deployment futures. */ private final ConcurrentMap<String, GridServiceDeploymentFuture> depFuts = new ConcurrentHashMap8<>(); @@ -135,12 +135,12 @@ public class GridServiceProcessor extends GridProcessorAdapter { ctx.cache().context().deploy().ignoreOwnership(false); } - GridServiceConfiguration[] cfgs = ctx.config().getServiceConfiguration(); + ManagedServiceConfiguration[] cfgs = ctx.config().getServiceConfiguration(); if (cfgs != null) { Collection<IgniteFuture<?>> futs = new ArrayList<>(); - for (GridServiceConfiguration c : ctx.config().getServiceConfiguration()) + for (ManagedServiceConfiguration c : ctx.config().getServiceConfiguration()) futs.add(deploy(c)); // Await for services to deploy. @@ -177,21 +177,21 @@ public class GridServiceProcessor extends GridProcessorAdapter { log.error("Failed to unsubscribe service assignment notifications.", e); } - Collection<GridServiceContextImpl> ctxs = new ArrayList<>(); + Collection<ManagedServiceContextImpl> ctxs = new ArrayList<>(); synchronized (locSvcs) { - for (Collection<GridServiceContextImpl> ctxs0 : locSvcs.values()) + for (Collection<ManagedServiceContextImpl> ctxs0 : locSvcs.values()) ctxs.addAll(ctxs0); } - for (GridServiceContextImpl ctx : ctxs) { + for (ManagedServiceContextImpl ctx : ctxs) { ctx.setCancelled(true); ctx.service().cancel(ctx); ctx.executor().shutdownNow(); } - for (GridServiceContextImpl ctx : ctxs) { + for (ManagedServiceContextImpl ctx : ctxs) { try { if (log.isInfoEnabled() && !ctxs.isEmpty()) log.info("Shutting down distributed service [name=" + ctx.name() + ", execId8=" + @@ -219,7 +219,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { * @param c Service configuration. * @throws GridRuntimeException If validation failed. */ - private void validate(GridServiceConfiguration c) throws GridRuntimeException { + private void validate(ManagedServiceConfiguration c) throws GridRuntimeException { IgniteConfiguration cfg = ctx.config(); GridDeploymentMode depMode = cfg.getDeploymentMode(); @@ -253,7 +253,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { * @param svc Service. * @return Future. */ - public IgniteFuture<?> deployNodeSingleton(ClusterGroup prj, String name, GridService svc) { + public IgniteFuture<?> deployNodeSingleton(ClusterGroup prj, String name, ManagedService svc) { return deployMultiple(prj, name, svc, 0, 1); } @@ -262,7 +262,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { * @param svc Service. * @return Future. */ - public IgniteFuture<?> deployClusterSingleton(ClusterGroup prj, String name, GridService svc) { + public IgniteFuture<?> deployClusterSingleton(ClusterGroup prj, String name, ManagedService svc) { return deployMultiple(prj, name, svc, 1, 1); } @@ -273,9 +273,9 @@ public class GridServiceProcessor extends GridProcessorAdapter { * @param maxPerNodeCnt Max per-node count. * @return Future. */ - public IgniteFuture<?> deployMultiple(ClusterGroup prj, String name, GridService svc, int totalCnt, + public IgniteFuture<?> deployMultiple(ClusterGroup prj, String name, ManagedService svc, int totalCnt, int maxPerNodeCnt) { - GridServiceConfiguration cfg = new GridServiceConfiguration(); + ManagedServiceConfiguration cfg = new ManagedServiceConfiguration(); cfg.setName(name); cfg.setService(svc); @@ -293,10 +293,10 @@ public class GridServiceProcessor extends GridProcessorAdapter { * @param affKey Affinity key. * @return Future. */ - public IgniteFuture<?> deployKeyAffinitySingleton(String name, GridService svc, String cacheName, Object affKey) { + public IgniteFuture<?> deployKeyAffinitySingleton(String name, ManagedService svc, String cacheName, Object affKey) { A.notNull(affKey, "affKey"); - GridServiceConfiguration cfg = new GridServiceConfiguration(); + ManagedServiceConfiguration cfg = new ManagedServiceConfiguration(); cfg.setName(name); cfg.setService(svc); @@ -312,7 +312,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { * @param cfg Service configuration. * @return Future for deployment. */ - public IgniteFuture<?> deploy(GridServiceConfiguration cfg) { + public IgniteFuture<?> deploy(ManagedServiceConfiguration cfg) { A.notNull(cfg, "cfg"); validate(cfg); @@ -460,8 +460,8 @@ public class GridServiceProcessor extends GridProcessorAdapter { /** * @return Collection of service descriptors. */ - public Collection<GridServiceDescriptor> deployedServices() { - Collection<GridServiceDescriptor> descs = new ArrayList<>(); + public Collection<ManagedServiceDescriptor> deployedServices() { + Collection<ManagedServiceDescriptor> descs = new ArrayList<>(); for (GridCacheEntry<Object, Object> e : cache.entrySetx()) { if (!(e.getKey() instanceof GridServiceDeploymentKey)) @@ -469,7 +469,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { GridServiceDeployment dep = (GridServiceDeployment)e.getValue(); - GridServiceDescriptorImpl desc = new GridServiceDescriptorImpl(dep); + ManagedServiceDescriptorImpl desc = new ManagedServiceDescriptorImpl(dep); try { GridServiceAssignments assigns = (GridServiceAssignments)cache.//flagsOn(GridCacheFlag.GET_PRIMARY). @@ -497,7 +497,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { */ @SuppressWarnings("unchecked") public <T> T service(String name) { - Collection<GridServiceContextImpl> ctxs; + Collection<ManagedServiceContextImpl> ctxs; synchronized (locSvcs) { ctxs = locSvcs.get(name); @@ -518,8 +518,8 @@ public class GridServiceProcessor extends GridProcessorAdapter { * @param name Service name. * @return Service by specified service name. */ - public GridServiceContextImpl serviceContext(String name) { - Collection<GridServiceContextImpl> ctxs; + public ManagedServiceContextImpl serviceContext(String name) { + Collection<ManagedServiceContextImpl> ctxs; synchronized (locSvcs) { ctxs = locSvcs.get(name); @@ -549,7 +549,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { throws GridRuntimeException { if (hasLocalNode(prj)) { - GridServiceContextImpl ctx = serviceContext(name); + ManagedServiceContextImpl ctx = serviceContext(name); if (ctx != null) { if (!svcItf.isAssignableFrom(ctx.service().getClass())) @@ -583,7 +583,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { */ @SuppressWarnings("unchecked") public <T> Collection<T> services(String name) { - Collection<GridServiceContextImpl> ctxs; + Collection<ManagedServiceContextImpl> ctxs; synchronized (locSvcs) { ctxs = locSvcs.get(name); @@ -595,7 +595,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { synchronized (ctxs) { Collection<T> res = new ArrayList<>(ctxs.size()); - for (GridServiceContextImpl ctx : ctxs) + for (ManagedServiceContextImpl ctx : ctxs) res.add((T)ctx.service()); return res; @@ -610,7 +610,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { * @throws GridException If failed. */ private void reassign(GridServiceDeployment dep, long topVer) throws GridException { - GridServiceConfiguration cfg = dep.configuration(); + ManagedServiceConfiguration cfg = dep.configuration(); int totalCnt = cfg.getTotalCount(); int maxPerNodeCnt = cfg.getMaxPerNodeCount(); @@ -748,9 +748,9 @@ public class GridServiceProcessor extends GridProcessorAdapter { if (assignCnt == null) assignCnt = 0; - GridService svc = assigns.service(); + ManagedService svc = assigns.service(); - Collection<GridServiceContextImpl> ctxs; + Collection<ManagedServiceContextImpl> ctxs; synchronized (locSvcs) { ctxs = locSvcs.get(svcName); @@ -769,11 +769,11 @@ public class GridServiceProcessor extends GridProcessorAdapter { int createCnt = assignCnt - ctxs.size(); for (int i = 0; i < createCnt; i++) { - final GridService cp = copyAndInject(svc); + final ManagedService cp = copyAndInject(svc); final ExecutorService exe = Executors.newSingleThreadExecutor(threadFactory); - final GridServiceContextImpl svcCtx = new GridServiceContextImpl(assigns.name(), + final ManagedServiceContextImpl svcCtx = new ManagedServiceContextImpl(assigns.name(), UUID.randomUUID(), assigns.cacheName(), assigns.affinityKey(), cp, exe); ctxs.add(svcCtx); @@ -849,13 +849,13 @@ public class GridServiceProcessor extends GridProcessorAdapter { * @param svc Service. * @return Copy of service. */ - private GridService copyAndInject(GridService svc) { + private ManagedService copyAndInject(ManagedService svc) { IgniteMarshaller m = ctx.config().getMarshaller(); try { byte[] bytes = m.marshal(svc); - GridService cp = m.unmarshal(bytes, svc.getClass().getClassLoader()); + ManagedService cp = m.unmarshal(bytes, svc.getClass().getClassLoader()); ctx.resource().inject(cp); @@ -872,9 +872,9 @@ public class GridServiceProcessor extends GridProcessorAdapter { * @param ctxs Contexts to cancel. * @param cancelCnt Number of contexts to cancel. */ - private void cancel(Iterable<GridServiceContextImpl> ctxs, int cancelCnt) { - for (Iterator<GridServiceContextImpl> it = ctxs.iterator(); it.hasNext();) { - GridServiceContextImpl ctx = it.next(); + private void cancel(Iterable<ManagedServiceContextImpl> ctxs, int cancelCnt) { + for (Iterator<ManagedServiceContextImpl> it = ctxs.iterator(); it.hasNext();) { + ManagedServiceContextImpl ctx = it.next(); // Flip cancelled flag. ctx.setCancelled(true); @@ -940,7 +940,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { svcName.set(name); - Collection<GridServiceContextImpl> ctxs; + Collection<ManagedServiceContextImpl> ctxs; synchronized (locSvcs) { ctxs = locSvcs.remove(name); @@ -1228,7 +1228,7 @@ public class GridServiceProcessor extends GridProcessorAdapter { svcName.set(name); - Collection<GridServiceContextImpl> ctxs; + Collection<ManagedServiceContextImpl> ctxs; synchronized (locSvcs) { ctxs = locSvcs.remove(name); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f809796/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProxy.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProxy.java index f9e61f2..4bae4d6 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProxy.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProxy.java @@ -29,7 +29,7 @@ import java.util.concurrent.atomic.*; import static org.gridgain.grid.kernal.GridClosureCallMode.*; /** - * Wrapper for making {@link GridService} class proxies. + * Wrapper for making {@link org.apache.ignite.managed.ManagedService} class proxies. */ class GridServiceProxy<T> implements Serializable { /** */ @@ -129,7 +129,7 @@ class GridServiceProxy<T> implements Serializable { // If service is deployed locally, then execute locally. if (node.isLocal()) { - GridServiceContextImpl svcCtx = ctx.service().serviceContext(name); + ManagedServiceContextImpl svcCtx = ctx.service().serviceContext(name); if (svcCtx != null) return mtd.invoke(svcCtx.service(), args); @@ -280,7 +280,7 @@ class GridServiceProxy<T> implements Serializable { * @return Map of number of service instances per node ID. */ private Map<UUID, Integer> serviceTopology(String name) { - for (GridServiceDescriptor desc : ctx.service().deployedServices()) { + for (ManagedServiceDescriptor desc : ctx.service().deployedServices()) { if (desc.name().equals(name)) return desc.topologySnapshot(); } @@ -334,7 +334,7 @@ class GridServiceProxy<T> implements Serializable { /** {@inheritDoc} */ @Override public Object call() throws Exception { - GridServiceContextImpl svcCtx = ((GridKernal) ignite).context().service().serviceContext(svcName); + ManagedServiceContextImpl svcCtx = ((GridKernal) ignite).context().service().serviceContext(svcName); if (svcCtx == null) throw new GridServiceNotFoundException(svcName); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f809796/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/ManagedServiceContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/ManagedServiceContextImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/ManagedServiceContextImpl.java new file mode 100644 index 0000000..94b7e1e --- /dev/null +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/ManagedServiceContextImpl.java @@ -0,0 +1,148 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.gridgain.grid.kernal.processors.service; + +import org.apache.ignite.managed.*; +import org.gridgain.grid.util.tostring.*; +import org.gridgain.grid.util.typedef.internal.*; +import org.jetbrains.annotations.*; + +import java.lang.reflect.*; +import java.util.*; +import java.util.concurrent.*; + +/** + * Service context implementation. + */ +public class ManagedServiceContextImpl implements ManagedServiceContext { + /** */ + private static final long serialVersionUID = 0L; + + /** Null method. */ + private static final Method NULL_METHOD = ManagedServiceContextImpl.class.getMethods()[0]; + + /** Service name. */ + private final String name; + + /** Execution ID. */ + private final UUID execId; + + /** Cache name. */ + private final String cacheName; + + /** Affinity key. */ + private final Object affKey; + + /** Service. */ + @GridToStringExclude + private final ManagedService svc; + + /** Executor service. */ + @GridToStringExclude + private final ExecutorService exe; + + /** Methods reflection cache. */ + private final ConcurrentMap<GridServiceMethodReflectKey, Method> mtds = new ConcurrentHashMap<>(); + + /** Cancelled flag. */ + private volatile boolean isCancelled; + + + /** + * @param name Service name. + * @param execId Execution ID. + * @param cacheName Cache name. + * @param affKey Affinity key. + * @param svc Service. + * @param exe Executor service. + */ + ManagedServiceContextImpl(String name, UUID execId, String cacheName, Object affKey, ManagedService svc, + ExecutorService exe) { + this.name = name; + this.execId = execId; + this.cacheName = cacheName; + this.affKey = affKey; + this.svc = svc; + this.exe = exe; + } + + /** {@inheritDoc} */ + @Override public String name() { + return name; + } + + /** {@inheritDoc} */ + @Override public UUID executionId() { + return execId; + } + + /** {@inheritDoc} */ + @Override public boolean isCancelled() { + return isCancelled; + } + + /** {@inheritDoc} */ + @Nullable @Override public String cacheName() { + return cacheName; + } + + /** {@inheritDoc} */ + @SuppressWarnings("unchecked") + @Nullable @Override public <K> K affinityKey() { + return (K)affKey; + } + + /** + * @return Service instance. + */ + ManagedService service() { + return svc; + } + + /** + * @return Executor service. + */ + ExecutorService executor() { + return exe; + } + + /** + * @param key Method key. + * @return Method. + */ + @Nullable Method method(GridServiceMethodReflectKey key) { + Method mtd = mtds.get(key); + + if (mtd == null) { + try { + mtd = svc.getClass().getMethod(key.methodName(), key.argTypes()); + } + catch (NoSuchMethodException e) { + mtd = NULL_METHOD; + } + + mtds.put(key, mtd); + } + + return mtd == NULL_METHOD ? null : mtd; + } + + /** + * @param isCancelled Cancelled flag. + */ + public void setCancelled(boolean isCancelled) { + this.isCancelled = isCancelled; + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(ManagedServiceContextImpl.class, this); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f809796/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/ManagedServiceDescriptorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/ManagedServiceDescriptorImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/ManagedServiceDescriptorImpl.java new file mode 100644 index 0000000..ff3d26b --- /dev/null +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/ManagedServiceDescriptorImpl.java @@ -0,0 +1,93 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.gridgain.grid.kernal.processors.service; + +import org.apache.ignite.managed.*; +import org.gridgain.grid.util.tostring.*; +import org.gridgain.grid.util.typedef.internal.*; +import org.jetbrains.annotations.*; + +import java.util.*; + +/** + * Service descriptor. + */ +public class ManagedServiceDescriptorImpl implements ManagedServiceDescriptor { + /** */ + private static final long serialVersionUID = 0L; + + /** Configuration. */ + @GridToStringInclude + private final GridServiceDeployment dep; + + /** Topology snapshot. */ + @GridToStringInclude + private Map<UUID, Integer> top; + + /** + * @param dep Deployment. + */ + public ManagedServiceDescriptorImpl(GridServiceDeployment dep) { + this.dep = dep; + } + + /** {@inheritDoc} */ + @Override public String name() { + return dep.configuration().getName(); + } + + /** {@inheritDoc} */ + @Override public Class<? extends ManagedService> serviceClass() { + return dep.configuration().getService().getClass(); + } + + /** {@inheritDoc} */ + @Override public int totalCount() { + return dep.configuration().getTotalCount(); + } + + /** {@inheritDoc} */ + @Override public int maxPerNodeCount() { + return dep.configuration().getMaxPerNodeCount(); + } + + /** {@inheritDoc} */ + @Nullable @Override public String cacheName() { + return dep.configuration().getCacheName(); + } + + /** {@inheritDoc} */ + @SuppressWarnings("unchecked") + @Nullable @Override public <K> K affinityKey() { + return (K)dep.configuration().getAffinityKey(); + } + + /** {@inheritDoc} */ + @Override public UUID originNodeId() { + return dep.nodeId(); + } + + /** {@inheritDoc} */ + @Override public Map<UUID, Integer> topologySnapshot() { + return top; + } + + /** + * @param top Topology snapshot. + */ + void topologySnapshot(Map<UUID, Integer> top) { + this.top = top; + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(ManagedServiceDescriptorImpl.class, this); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f809796/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/DummyService.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/DummyService.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/DummyService.java index 88dbb15..c0179d0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/DummyService.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/DummyService.java @@ -18,7 +18,7 @@ import java.util.concurrent.atomic.*; /** * Dummy service. */ -public class DummyService implements GridService { +public class DummyService implements ManagedService { /** */ private static final long serialVersionUID = 0L; @@ -38,7 +38,7 @@ public class DummyService implements GridService { private static final ConcurrentMap<String, AtomicInteger> cancelled = new ConcurrentHashMap8<>(); /** {@inheritDoc} */ - @Override public void cancel(GridServiceContext ctx) { + @Override public void cancel(ManagedServiceContext ctx) { AtomicInteger cntr = cancelled.get(ctx.name()); if (cntr == null) { @@ -59,7 +59,7 @@ public class DummyService implements GridService { } /** {@inheritDoc} */ - @Override public void init(GridServiceContext ctx) throws Exception { + @Override public void init(ManagedServiceContext ctx) throws Exception { AtomicInteger cntr = inited.get(ctx.name()); if (cntr == null) { @@ -75,7 +75,7 @@ public class DummyService implements GridService { } /** {@inheritDoc} */ - @Override public void execute(GridServiceContext ctx) { + @Override public void execute(ManagedServiceContext ctx) { AtomicInteger cntr = started.get(ctx.name()); if (cntr == null) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f809796/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java index e81c186..035ff40 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java @@ -54,7 +54,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs c.setDiscoverySpi(discoSpi); - GridServiceConfiguration[] svcs = services(); + ManagedServiceConfiguration[] svcs = services(); if (svcs != null) c.setServiceConfiguration(svcs); @@ -82,7 +82,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs * * @return Services configuration. */ - protected GridServiceConfiguration[] services() { + protected ManagedServiceConfiguration[] services() { return null; } @@ -470,7 +470,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs * @param descs Descriptors. * @param cnt Expected count. */ - protected void checkCount(String svcName, Iterable<GridServiceDescriptor> descs, int cnt) { + protected void checkCount(String svcName, Iterable<ManagedServiceDescriptor> descs, int cnt) { assertEquals(cnt, actualCount(svcName, descs)); } @@ -479,10 +479,10 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs * @param descs Descriptors. * @return Services count. */ - protected int actualCount(String svcName, Iterable<GridServiceDescriptor> descs) { + protected int actualCount(String svcName, Iterable<ManagedServiceDescriptor> descs) { int sum = 0; - for (GridServiceDescriptor d : descs) { + for (ManagedServiceDescriptor d : descs) { if (d.name().equals(svcName)) { for (Integer i : d.topologySnapshot().values()) sum += i; @@ -515,7 +515,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * Affinity service. */ - protected static class AffinityService implements GridService { + protected static class AffinityService implements ManagedService { /** */ private static final long serialVersionUID = 0L; @@ -534,12 +534,12 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs } /** {@inheritDoc} */ - @Override public void cancel(GridServiceContext ctx) { + @Override public void cancel(ManagedServiceContext ctx) { // No-op. } /** {@inheritDoc} */ - @Override public void init(GridServiceContext ctx) throws Exception { + @Override public void init(ManagedServiceContext ctx) throws Exception { X.println("Initializing affinity service for key: " + affKey); ClusterNode n = g.cache(CACHE_NAME).affinity().mapKeyToNode(affKey); @@ -549,7 +549,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs } /** {@inheritDoc} */ - @Override public void execute(GridServiceContext ctx) { + @Override public void execute(ManagedServiceContext ctx) { X.println("Executing affinity service for key: " + affKey); } } @@ -557,7 +557,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs /** * Counter service implementation. */ - protected static class CounterServiceImpl implements CounterService, GridService { + protected static class CounterServiceImpl implements CounterService, ManagedService { /** Auto-injected grid instance. */ @IgniteInstanceResource private Ignite ignite; @@ -616,12 +616,12 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs } /** {@inheritDoc} */ - @Override public void cancel(GridServiceContext ctx) { + @Override public void cancel(ManagedServiceContext ctx) { X.println("Stopping counter service: " + ctx.name()); } /** {@inheritDoc} */ - @Override public void init(GridServiceContext ctx) throws Exception { + @Override public void init(ManagedServiceContext ctx) throws Exception { X.println("Initializing counter service: " + ctx.name()); key = ctx.name(); @@ -630,7 +630,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs } /** {@inheritDoc} */ - @Override public void execute(GridServiceContext ctx) throws Exception { + @Override public void execute(ManagedServiceContext ctx) throws Exception { X.println("Executing counter service: " + ctx.name()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f809796/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java index f7be967..c45feb1 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java @@ -38,10 +38,10 @@ public class GridServiceProcessorMultiNodeConfigSelfTest extends GridServiceProc } /** {@inheritDoc} */ - @Override protected GridServiceConfiguration[] services() { - GridServiceConfiguration[] arr = new GridServiceConfiguration[3]; + @Override protected ManagedServiceConfiguration[] services() { + ManagedServiceConfiguration[] arr = new ManagedServiceConfiguration[3]; - GridServiceConfiguration cfg = new GridServiceConfiguration(); + ManagedServiceConfiguration cfg = new ManagedServiceConfiguration(); cfg.setName(CLUSTER_SINGLE); cfg.setMaxPerNodeCount(1); @@ -50,7 +50,7 @@ public class GridServiceProcessorMultiNodeConfigSelfTest extends GridServiceProc arr[0] = cfg; - cfg = new GridServiceConfiguration(); + cfg = new ManagedServiceConfiguration(); cfg.setName(NODE_SINGLE); cfg.setMaxPerNodeCount(1); @@ -58,7 +58,7 @@ public class GridServiceProcessorMultiNodeConfigSelfTest extends GridServiceProc arr[1] = cfg; - cfg = new GridServiceConfiguration(); + cfg = new ManagedServiceConfiguration(); cfg.setName(AFFINITY); cfg.setCacheName(CACHE_NAME); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f809796/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorProxySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorProxySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorProxySelfTest.java index 3c62027..d3b6efe 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorProxySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorProxySelfTest.java @@ -186,7 +186,7 @@ public class GridServiceProcessorProxySelfTest extends GridServiceProcessorAbstr MapService<Integer, String> svc = grid(i).managed().serviceProxy(name, MapService.class, false); // Make sure service is a proxy. - assertFalse(svc instanceof GridService); + assertFalse(svc instanceof ManagedService); svc.put(i, Integer.toString(i)); } @@ -208,7 +208,7 @@ public class GridServiceProcessorProxySelfTest extends GridServiceProcessorAbstr MapService<Integer, String> svc = grid(i).managed().serviceProxy(name, MapService.class, false); // Make sure service is a local instance. - assertTrue(svc instanceof GridService); + assertTrue(svc instanceof ManagedService); svc.put(i, Integer.toString(i)); } @@ -234,7 +234,7 @@ public class GridServiceProcessorProxySelfTest extends GridServiceProcessorAbstr serviceProxy(name, MapService.class, false); // Make sure service is a local instance. - assertFalse(svc instanceof GridService); + assertFalse(svc instanceof ManagedService); for (int i = 0; i < nodeCount(); i++) svc.put(i, Integer.toString(i)); @@ -246,7 +246,7 @@ public class GridServiceProcessorProxySelfTest extends GridServiceProcessorAbstr serviceProxy(name, MapService.class, false); // Make sure service is a local instance. - assertFalse(map instanceof GridService); + assertFalse(map instanceof ManagedService); size += map.size(); } @@ -269,7 +269,7 @@ public class GridServiceProcessorProxySelfTest extends GridServiceProcessorAbstr serviceProxy(name, MapService.class, true); // Make sure service is a local instance. - assertFalse(svc instanceof GridService); + assertFalse(svc instanceof ManagedService); for (int i = 0; i < nodeCount(); i++) svc.put(i, Integer.toString(i)); @@ -281,7 +281,7 @@ public class GridServiceProcessorProxySelfTest extends GridServiceProcessorAbstr serviceProxy(name, MapService.class, false); // Make sure service is a local instance. - assertFalse(map instanceof GridService); + assertFalse(map instanceof ManagedService); if (map.size() != 0) size += map.size(); @@ -327,7 +327,7 @@ public class GridServiceProcessorProxySelfTest extends GridServiceProcessorAbstr /** * Cache service implementation. */ - protected static class MapServiceImpl<K, V> implements MapService<K, V>, GridService { + protected static class MapServiceImpl<K, V> implements MapService<K, V>, ManagedService { /** Underlying cache map. */ private final Map<K, V> map = new ConcurrentHashMap<>(); @@ -351,17 +351,17 @@ public class GridServiceProcessorProxySelfTest extends GridServiceProcessorAbstr } /** {@inheritDoc} */ - @Override public void cancel(GridServiceContext ctx) { + @Override public void cancel(ManagedServiceContext ctx) { X.println("Stopping cache service: " + ctx.name()); } /** {@inheritDoc} */ - @Override public void init(GridServiceContext ctx) throws Exception { + @Override public void init(ManagedServiceContext ctx) throws Exception { X.println("Initializing counter service: " + ctx.name()); } /** {@inheritDoc} */ - @Override public void execute(GridServiceContext ctx) throws Exception { + @Override public void execute(ManagedServiceContext ctx) throws Exception { X.println("Executing cache service: " + ctx.name()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f809796/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridServiceInjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridServiceInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridServiceInjectionSelfTest.java index 87c9b20..f1edf8f 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridServiceInjectionSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridServiceInjectionSelfTest.java @@ -61,7 +61,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme @Override public Object call() throws Exception { assertNotNull(svc); - assertTrue(svc instanceof GridService); + assertTrue(svc instanceof ManagedService); svc.noop(); @@ -82,7 +82,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme assertNotNull(svc); // Ensure proxy instance. - assertFalse(svc instanceof GridService); + assertFalse(svc instanceof ManagedService); svc.noop(); @@ -103,7 +103,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme assertNotNull(svc); // Ensure proxy instance. - assertTrue(svc instanceof GridService); + assertTrue(svc instanceof ManagedService); svc.noop(); @@ -146,7 +146,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme private void service(DummyService svc) { assertNotNull(svc); - assertTrue(svc instanceof GridService); + assertTrue(svc instanceof ManagedService); this.svc = svc; } @@ -171,7 +171,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme assertNotNull(svc); // Ensure proxy instance. - assertFalse(svc instanceof GridService); + assertFalse(svc instanceof ManagedService); this.svc = svc; } @@ -196,7 +196,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme assertNotNull(svc); // Ensure proxy instance. - assertTrue(svc instanceof GridService); + assertTrue(svc instanceof ManagedService); this.svc = svc; } @@ -274,7 +274,7 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme /** * No-op test service. */ - public static class DummyServiceImpl implements DummyService, GridService { + public static class DummyServiceImpl implements DummyService, ManagedService { /** */ private static final long serialVersionUID = 0L; @@ -284,17 +284,17 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme } /** {@inheritDoc} */ - @Override public void cancel(GridServiceContext ctx) { + @Override public void cancel(ManagedServiceContext ctx) { System.out.println("Cancelling service: " + ctx.name()); } /** {@inheritDoc} */ - @Override public void init(GridServiceContext ctx) throws Exception { + @Override public void init(ManagedServiceContext ctx) throws Exception { System.out.println("Initializing service: " + ctx.name()); } /** {@inheritDoc} */ - @Override public void execute(GridServiceContext ctx) { + @Override public void execute(ManagedServiceContext ctx) { System.out.println("Executing service: " + ctx.name()); } }
