Author: hadrian
Date: Thu Dec 20 01:39:16 2012
New Revision: 1424264
URL: http://svn.apache.org/viewvc?rev=1424264&view=rev
Log:
ODE-983. Remove deps on commons.logging. Extra cleanup of warnings
Modified:
ode/trunk/jacob-ap/src/main/java/org/apache/ode/jacob/ap/ChannelTypeAnnotationProcessor.java
ode/trunk/jacob-generator/src/main/java/org/apache/ode/jacob/generator/ChannelTypeProcessor.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobRunnable.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobThread.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/SynchChannelListener.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ValChannelListener.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommRecv.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CellChannelListener.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStreamChannelListener.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrintChannelListener.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
Modified:
ode/trunk/jacob-ap/src/main/java/org/apache/ode/jacob/ap/ChannelTypeAnnotationProcessor.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob-ap/src/main/java/org/apache/ode/jacob/ap/ChannelTypeAnnotationProcessor.java?rev=1424264&r1=1424263&r2=1424264&view=diff
==============================================================================
---
ode/trunk/jacob-ap/src/main/java/org/apache/ode/jacob/ap/ChannelTypeAnnotationProcessor.java
(original)
+++
ode/trunk/jacob-ap/src/main/java/org/apache/ode/jacob/ap/ChannelTypeAnnotationProcessor.java
Thu Dec 20 01:39:16 2012
@@ -116,9 +116,6 @@ class ChannelTypeAnnotationProcessor imp
pw.println();
pw.println("package " + c.getPackage().getQualifiedName() + ";");
pw.println();
- pw.println("import org.apache.commons.logging.LogFactory;");
- pw.println("import org.apache.commons.logging.Log;");
- pw.println();
pw.println("/**");
pw.println(" * An auto-generated channel listener abstract class for
the ");
pw.println(" * {@link " + c.getQualifiedName() + "} channel type. ");
@@ -129,11 +126,6 @@ class ChannelTypeAnnotationProcessor imp
pw.println(" extends org.apache.ode.jacob.ChannelListener<" +
c.getQualifiedName() + "Channel>" );
pw.println(" implements " + c.getQualifiedName());
pw.println("{");
- pw.println();
- pw.println(" private static final Log __log = LogFactory.getLog(" +
c.getQualifiedName() + ".class);");
- pw.println();
- pw.println(" protected Log log() { return __log; } " );
- pw.println();
pw.println(" protected " + c.getSimpleName() + "ChannelListener(" +
c.getQualifiedName() + "Channel channel) {");
pw.println(" super(channel);");
pw.println(" }");
Modified:
ode/trunk/jacob-generator/src/main/java/org/apache/ode/jacob/generator/ChannelTypeProcessor.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob-generator/src/main/java/org/apache/ode/jacob/generator/ChannelTypeProcessor.java?rev=1424264&r1=1424263&r2=1424264&view=diff
==============================================================================
---
ode/trunk/jacob-generator/src/main/java/org/apache/ode/jacob/generator/ChannelTypeProcessor.java
(original)
+++
ode/trunk/jacob-generator/src/main/java/org/apache/ode/jacob/generator/ChannelTypeProcessor.java
Thu Dec 20 01:39:16 2012
@@ -94,9 +94,6 @@ public class ChannelTypeProcessor extend
"<interfaces> {\n" +
"}";
private static final String LISTENER_DECL =
- "import org.apache.commons.logging.Log;\n" +
- "import org.apache.commons.logging.LogFactory;\n" +
- "\n" +
"/**\n" +
" * An auto-generated channel listener abstract class for the \n" +
" * {@link <fqn>} channel type. \n" +
@@ -107,12 +104,6 @@ public class ChannelTypeProcessor extend
" extends org.apache.ode.jacob.ChannelListener<<fqn>Channel>\n" +
" implements <fqn> {\n" +
"\n" +
- " private static final Log LOG = LogFactory.getLog(<fqn>.class);\n"
+
- "\n" +
- " protected Log log() {\n" +
- " return LOG;\n" +
- " }\n" +
- "\n" +
" protected <name>ChannelListener(<fqn>Channel channel) {\n" +
" super(channel);\n" +
" }\n" +
Modified:
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java?rev=1424264&r1=1424263&r2=1424264&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java
(original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java Thu
Dec 20 01:39:16 2012
@@ -28,6 +28,7 @@ import java.util.Set;
* Base-class for method-list objects. Method-lists objects should extends this
* class <em>and</em> implement one <code>Channel</code> interface.
*/
+@SuppressWarnings("serial")
public abstract class ChannelListener<CT extends Channel> extends JacobObject {
private transient Set<Method> _implementedMethods;
private transient CT _channel;
@@ -49,15 +50,15 @@ public abstract class ChannelListener<CT
_channel = channel;
}
- public Set<ChannelListener> or(ChannelListener other) {
- HashSet<ChannelListener> retval = new HashSet<ChannelListener>();
+ public Set<ChannelListener<?>> or(ChannelListener<?> other) {
+ HashSet<ChannelListener<?>> retval = new HashSet<ChannelListener<?>>();
retval.add(this);
retval.add(other);
return retval;
}
- public Set<ChannelListener> or(Set<ChannelListener> other) {
- HashSet<ChannelListener> retval = new HashSet<ChannelListener>(other);
+ public Set<ChannelListener<?>> or(Set<ChannelListener<?>> other) {
+ HashSet<ChannelListener<?>> retval = new
HashSet<ChannelListener<?>>(other);
retval.add(this);
return retval;
}
@@ -71,8 +72,8 @@ public abstract class ChannelListener<CT
return _implementedMethods;
}
- private static Set<Method> getImplementedMethods(Set<Method> methods,
Class clazz) {
- Class[] interfaces = clazz.getInterfaces();
+ private static Set<Method> getImplementedMethods(Set<Method> methods,
Class<?> clazz) {
+ Class<?>[] interfaces = clazz.getInterfaces();
for (int i=0; i<interfaces.length; ++i) {
if (interfaces[i] != Channel.class) {
Method[] allmethods = interfaces[i].getDeclaredMethods();
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java?rev=1424264&r1=1424263&r2=1424264&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java
(original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java Thu Dec
20 01:39:16 2012
@@ -28,6 +28,7 @@ import org.apache.ode.jacob.vpu.JacobVPU
* Base class for constructs which rely on a Java method body to represent some
* aspect of the process.
*/
+@SuppressWarnings("serial")
public abstract class JacobObject implements Serializable {
public abstract Set<Method> getImplementedMethods();
@@ -38,7 +39,7 @@ public abstract class JacobObject implem
return getClass().getSimpleName();
}
- protected static Object getExtension(Class extensionClass) {
+ protected static Object getExtension(Class<?> extensionClass) {
return JacobVPU.activeJacobThread().getExtension(extensionClass);
}
@@ -86,15 +87,15 @@ public abstract class JacobObject implem
return methodList.getChannel();
}
- protected static void object(boolean replication, ChannelListener
methodList) {
+ protected static void object(boolean replication, ChannelListener<?>
methodList) {
JacobVPU.activeJacobThread().object(replication, methodList);
}
- protected static void object(boolean replication, ChannelListener[]
methodLists) {
+ protected static void object(boolean replication, ChannelListener<?>[]
methodLists) {
JacobVPU.activeJacobThread().object(replication, methodLists);
}
- protected static void object(boolean replication, Set<ChannelListener>
methodLists) {
+ protected static void object(boolean replication, Set<ChannelListener<?>>
methodLists) {
JacobVPU.activeJacobThread().object(replication,
methodLists.toArray(new ChannelListener[methodLists.size()]));
}
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobRunnable.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobRunnable.java?rev=1424264&r1=1424263&r2=1424264&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobRunnable.java
(original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobRunnable.java Thu
Dec 20 01:39:16 2012
@@ -65,6 +65,7 @@ import java.util.Set;
*
* @author Maciej Szefler <a href="mailto:[email protected]"; />
*/
+@SuppressWarnings("serial")
public abstract class JacobRunnable extends JacobObject {
private static final Set<Method> IMPLEMENTED_METHODS;
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobThread.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobThread.java?rev=1424264&r1=1424263&r2=1424264&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobThread.java
(original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobThread.java Thu Dec
20 01:39:16 2012
@@ -25,8 +25,8 @@ import java.lang.reflect.Method;
* <p>
* Note: these operations represent a subset of a process algebra mapped into
* Java invocations; other aspects of the syntax are represented natively in
Java.
- * In particular, parallel composition is modelled as sequential Java
invocation
- * and if-else are modelled using Java's if-else statement. Note also that the
+ * In particular, parallel composition is modeled as sequential Java invocation
+ * and if-else are modeled using Java's if-else statement. Note also that the
* scoping rules for channel names are simply the Java object visibility rules.
*/
public interface JacobThread {
@@ -34,7 +34,7 @@ public interface JacobThread {
public String exportChannel(Channel channel);
- public Channel importChannel(String channelId, Class channelClass);
+ public Channel importChannel(String channelId, Class<?> channelClass);
/**
* Create a process instance i.e. a concretion of a process abstraction.
@@ -57,8 +57,7 @@ public interface JacobThread {
/**
* Create a new channel.
*/
- public Channel newChannel(Class channelType, String creator,
- String description);
+ public Channel newChannel(Class<?> channelType, String creator, String
description);
/**
* <p>
@@ -85,9 +84,9 @@ public interface JacobThread {
* @throws IllegalArgumentException
* if the method list does not match the channel kind
*/
- public void object(boolean replicate, ChannelListener methodList)
- throws IllegalArgumentException;
+ public void object(boolean replicate, ChannelListener<?> methodList)
+ throws IllegalArgumentException;
- public void object(boolean reaplicate, ChannelListener[] methodLists)
- throws IllegalArgumentException;
+ public void object(boolean reaplicate, ChannelListener<?>[] methodLists)
+ throws IllegalArgumentException;
}
Modified:
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/SynchChannelListener.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/SynchChannelListener.java?rev=1424264&r1=1424263&r2=1424264&view=diff
==============================================================================
---
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/SynchChannelListener.java
(original)
+++
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/SynchChannelListener.java
Thu Dec 20 01:39:16 2012
@@ -16,6 +16,7 @@ package org.apache.ode.jacob;
* @see org.apache.ode.jacob.Synch
* @see org.apache.ode.jacob.SynchChannel
*/
+@SuppressWarnings("serial")
public abstract class SynchChannelListener
extends
org.apache.ode.jacob.ChannelListener<org.apache.ode.jacob.SynchChannel>
implements org.apache.ode.jacob.Synch
Modified:
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ValChannelListener.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ValChannelListener.java?rev=1424264&r1=1424263&r2=1424264&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ValChannelListener.java
(original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ValChannelListener.java
Thu Dec 20 01:39:16 2012
@@ -16,6 +16,7 @@ package org.apache.ode.jacob;
* @see org.apache.ode.jacob.Val
* @see org.apache.ode.jacob.ValChannel
*/
+@SuppressWarnings("serial")
public abstract class ValChannelListener
extends
org.apache.ode.jacob.ChannelListener<org.apache.ode.jacob.ValChannel>
implements org.apache.ode.jacob.Val
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommRecv.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommRecv.java?rev=1424264&r1=1424263&r2=1424264&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommRecv.java
(original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/soup/CommRecv.java Thu
Dec 20 01:39:16 2012
@@ -29,12 +29,12 @@ import org.apache.ode.jacob.ChannelListe
* replicated variety.
*/
public class CommRecv extends Comm {
- private ChannelListener _continuation;
+ private ChannelListener<?> _continuation;
protected CommRecv() {
}
- public CommRecv(CommChannel chnl, ChannelListener continuation) {
+ public CommRecv(CommChannel chnl, ChannelListener<?> continuation) {
super(null, chnl);
_continuation = continuation;
}
@@ -48,7 +48,7 @@ public class CommRecv extends Comm {
*
* @return byte array representing the serialized form of the continuation
*/
- public ChannelListener getContinuation() {
+ public ChannelListener<?> getContinuation() {
return _continuation;
}
Modified:
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java?rev=1424264&r1=1424263&r2=1424264&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java
(original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java
Thu Dec 20 01:39:16 2012
@@ -49,9 +49,9 @@ public class ChannelFactory {
return cih._backend;
}
- public static Channel createChannel(CommChannel backend, Class type) {
+ public static Channel createChannel(CommChannel backend, Class<?> type) {
InvocationHandler h = new ChannelInvocationHandler(backend);
- Class[] ifaces = new Class[] { Channel.class, type };
+ Class<?>[] ifaces = new Class[] { Channel.class, type };
Object proxy = Proxy.newProxyInstance(Channel.class.getClassLoader(),
ifaces, h);
return (Channel) proxy;
}
Modified:
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java?rev=1424264&r1=1424263&r2=1424264&view=diff
==============================================================================
---
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
(original)
+++
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
Thu Dec 20 01:39:16 2012
@@ -29,7 +29,6 @@ import java.io.ObjectStreamClass;
import java.io.OutputStream;
import java.io.PrintStream;
import java.io.Serializable;
-import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.HashSet;
@@ -39,7 +38,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
import org.apache.ode.jacob.Channel;
import org.apache.ode.jacob.ChannelListener;
@@ -54,7 +52,6 @@ import org.apache.ode.jacob.soup.Continu
import org.apache.ode.jacob.soup.ExecutionQueue;
import org.apache.ode.jacob.soup.ExecutionQueueObject;
import org.apache.ode.jacob.soup.ReplacementMap;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -139,8 +136,8 @@ public class ExecutionQueueImpl implemen
Continuation continuation = null;
if (!_reactions.isEmpty()) {
- Iterator it = _reactions.iterator();
- continuation = (Continuation) it.next();
+ Iterator<Continuation> it = _reactions.iterator();
+ continuation = it.next();
it.remove();
}
return continuation;
@@ -151,8 +148,8 @@ public class ExecutionQueueImpl implemen
verifyNew(group);
CommGroupFrame commGroupFrame = new
CommGroupFrame(group.isReplicated());
- for (Iterator i = group.getElements(); i.hasNext();) {
- Comm comm = (Comm) i.next();
+ for (Iterator<Comm> i = group.getElements(); i.hasNext();) {
+ Comm comm = i.next();
ChannelFrame chnlFrame =
findChannelFrame(comm.getChannel().getId());
if (comm instanceof CommSend) {
if (chnlFrame.replicatedSend) {
@@ -184,8 +181,8 @@ public class ExecutionQueueImpl implemen
}
// Match communications.
- for (Iterator i = group.getElements(); i.hasNext();) {
- Comm comm = (Comm) i.next();
+ for (Iterator<Comm> i = group.getElements(); i.hasNext();) {
+ Comm comm = i.next();
matchCommunications(comm.getChannel());
}
}
@@ -303,21 +300,21 @@ public class ExecutionQueueImpl implemen
}
sos.writeInt(_channels.values().size());
- for (Iterator i = _channels.values().iterator(); i.hasNext();) {
- ChannelFrame cframe = (ChannelFrame) i.next();
+ for (Iterator<ChannelFrame> i = _channels.values().iterator();
i.hasNext();) {
+ ChannelFrame cframe = i.next();
sos.writeInt(cframe.objFrames.size());
- for (Iterator j = cframe.objFrames.iterator(); j.hasNext();) {
+ for (Iterator<ObjectFrame> j = cframe.objFrames.iterator();
j.hasNext();) {
sos.writeObject(j.next());
}
sos.writeInt(cframe.msgFrames.size());
- for (Iterator j = cframe.msgFrames.iterator(); j.hasNext();) {
+ for (Iterator<MessageFrame> j = cframe.msgFrames.iterator();
j.hasNext();) {
sos.writeObject(j.next());
}
}
- Set referencedChannels = sos.getSerializedChannels();
- for (Iterator i = _channels.values().iterator(); i.hasNext();) {
- ChannelFrame cframe = (ChannelFrame) i.next();
+ Set<Object> referencedChannels = sos.getSerializedChannels();
+ for (Iterator<ChannelFrame> i = _channels.values().iterator();
i.hasNext();) {
+ ChannelFrame cframe = i.next();
if (referencedChannels.contains(Integer.valueOf(cframe.id)) ||
cframe.refCount > 0) {
// skip
} else {
@@ -328,8 +325,8 @@ public class ExecutionQueueImpl implemen
}
sos.writeInt(_channels.values().size());
- for (Iterator i = _channels.values().iterator(); i.hasNext();) {
- ChannelFrame cframe = (ChannelFrame) i.next();
+ for (Iterator<ChannelFrame> i = _channels.values().iterator();
i.hasNext();) {
+ ChannelFrame cframe = i.next();
LOG.debug("Writing Channel: {}", cframe);
sos.writeObject(cframe);
}
@@ -364,8 +361,8 @@ public class ExecutionQueueImpl implemen
if (!_reactions.isEmpty()) {
ps.println("-- REACTIONS");
int cnt = 0;
- for (Iterator i = _reactions.iterator(); i.hasNext();) {
- Continuation continuation = (Continuation) i.next();
+ for (Iterator<Continuation> i = _reactions.iterator();
i.hasNext();) {
+ Continuation continuation = i.next();
ps.println(" #" + (++cnt) + ": " + continuation.toString());
}
}
@@ -417,8 +414,8 @@ public class ExecutionQueueImpl implemen
private void removeCommGroup(CommGroupFrame groupFrame) {
// Add all channels reference in the group to the GC candidate set.
- for (Iterator i = groupFrame.commFrames.iterator(); i.hasNext();) {
- CommFrame frame = (CommFrame) i.next();
+ for (Iterator<CommFrame> i = groupFrame.commFrames.iterator();
i.hasNext();) {
+ CommFrame frame = i.next();
if (frame instanceof ObjectFrame) {
assert frame.channelFrame.objFrames.contains(frame);
frame.channelFrame.objFrames.remove(frame);
@@ -439,7 +436,7 @@ public class ExecutionQueueImpl implemen
}
private static class ChannelFrame implements Externalizable {
- Class type;
+ Class<?> type;
int id;
@@ -456,10 +453,12 @@ public class ExecutionQueueImpl implemen
public String description;
+ // Used for deserialization
+ @SuppressWarnings("unused")
public ChannelFrame() {
}
- public ChannelFrame(Class type, int id, String name, String
description) {
+ public ChannelFrame(Class<?> type, int id, String name, String
description) {
this.type = type;
this.id = id;
this.description = description;
@@ -470,7 +469,7 @@ public class ExecutionQueueImpl implemen
}
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- type = (Class) in.readObject();
+ type = (Class<?>)in.readObject();
id = in.readInt();
description = in.readUTF();
refCount = in.readInt();
@@ -527,20 +526,18 @@ public class ExecutionQueueImpl implemen
}
}
+ @SuppressWarnings("serial")
private static class CommGroupFrame implements Serializable {
boolean replicated;
-
public Set<CommFrame> commFrames = new HashSet<CommFrame>();
public CommGroupFrame(boolean replicated) {
this.replicated = replicated;
}
-
}
private static class CommFrame implements Externalizable {
CommGroupFrame commGroupFrame;
-
ChannelFrame channelFrame;
public CommFrame() {
@@ -565,20 +562,21 @@ public class ExecutionQueueImpl implemen
private static class ObjectFrame extends CommFrame implements
Externalizable {
private static final long serialVersionUID = -7212430608484116919L;
- ChannelListener _continuation;
+ ChannelListener<?> _continuation;
+ // Used for deserialization
+ @SuppressWarnings("unused")
public ObjectFrame() {
- super();
}
- public ObjectFrame(CommGroupFrame commGroupFrame, ChannelFrame
channelFrame, ChannelListener continuation) {
+ public ObjectFrame(CommGroupFrame commGroupFrame, ChannelFrame
channelFrame, ChannelListener<?> continuation) {
super(commGroupFrame, channelFrame);
this._continuation = continuation;
}
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
super.readExternal(in);
- _continuation = (ChannelListener) in.readObject();
+ _continuation = (ChannelListener<?>)in.readObject();
}
public void writeExternal(ObjectOutput out) throws IOException {
@@ -591,11 +589,11 @@ public class ExecutionQueueImpl implemen
private static final long serialVersionUID = -1112437852498126297L;
String method;
-
Object[] args;
+ // Used for deserialization
+ @SuppressWarnings("unused")
public MessageFrame() {
- super();
}
public MessageFrame(CommGroupFrame commFrame, ChannelFrame
channelFrame, String method, Object[] args) {
@@ -609,17 +607,18 @@ public class ExecutionQueueImpl implemen
method = in.readUTF();
int numArgs = in.readInt();
args = new Object[numArgs];
- for (int i = 0; i < numArgs; ++i)
+ for (int i = 0; i < numArgs; ++i) {
args[i] = in.readObject();
-
+ }
}
public void writeExternal(ObjectOutput out) throws IOException {
super.writeExternal(out);
out.writeUTF(method);
out.writeInt(args.length);
- for (int i = 0; i < args.length; ++i)
+ for (int i = 0; i < args.length; ++i) {
out.writeObject(args[i]);
+ }
}
}
@@ -635,7 +634,8 @@ public class ExecutionQueueImpl implemen
private Set<Object> _serializedChannels = new HashSet<Object>();
public ExecutionQueueOutputStream(OutputStream outputStream) throws
IOException {
- super(new GZIPOutputStream(outputStream));
+ // super(new GZIPOutputStream(outputStream));
+ super(outputStream);
enableReplaceObject(true);
}
@@ -737,15 +737,17 @@ public class ExecutionQueueImpl implemen
}
private static final class ChannelRef implements Externalizable {
- private Class _type;
+ private Class<?> _type;
private Integer _id;
- private ChannelRef(Class type, Integer id) {
+ private ChannelRef(Class<?> type, Integer id) {
_type = type;
_id = id;
}
+ // Used for deserialization
+ @SuppressWarnings("unused")
public ChannelRef() {
}
@@ -763,7 +765,7 @@ public class ExecutionQueueImpl implemen
}
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- _type = (Class) in.readObject();
+ _type = (Class<?>)in.readObject();
_id = Integer.valueOf(in.readInt());
}
}
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java?rev=1424264&r1=1424263&r2=1424264&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java
(original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java Thu
Dec 20 01:39:16 2012
@@ -190,7 +190,7 @@ public final class JacobVPU {
buf.append(" & ");
}
buf.append(method.getName()).append('(');
- Class[] argTypes = method.getParameterTypes();
+ Class<?>[] argTypes = method.getParameterTypes();
for (int j = 0; j < argTypes.length; ++j) {
if (j > 0) {
buf.append(", ");
@@ -300,7 +300,7 @@ public final class JacobVPU {
return replyChannel;
}
- public Channel newChannel(Class channelType, String creator, String
description) {
+ public Channel newChannel(Class<?> channelType, String creator, String
description) {
CommChannel chnl = new CommChannel(channelType);
chnl.setDescription(description);
_executionQueue.add(chnl);
@@ -319,12 +319,12 @@ public final class JacobVPU {
return _executionQueue.createExport(chnl);
}
- public Channel importChannel(String channelId, Class channelType) {
+ public Channel importChannel(String channelId, Class<?> channelType) {
CommChannel cframe = _executionQueue.consumeExport(channelId);
return ChannelFactory.createChannel(cframe, channelType);
}
- public void object(boolean replicate, ChannelListener[] ml) {
+ public void object(boolean replicate, ChannelListener<?>[] ml) {
if (LOG.isTraceEnabled()) {
StringBuffer msg = new StringBuffer();
msg.append(_cycle);
@@ -353,9 +353,8 @@ public final class JacobVPU {
_executionQueue.add(grp);
}
- public void object(boolean replicate, ChannelListener methodList)
- throws IllegalArgumentException {
- object(replicate, new ChannelListener[] { methodList });
+ public void object(boolean replicate, ChannelListener<?> methodList)
throws IllegalArgumentException {
+ object(replicate, new ChannelListener<?>[] { methodList });
}
/* UNUSED
Modified:
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java?rev=1424264&r1=1424263&r2=1424264&view=diff
==============================================================================
--- ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java
(original)
+++ ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java
Thu Dec 20 01:39:16 2012
@@ -56,7 +56,7 @@ public class CELL_<T> extends JacobRunna
// Note: sequential Java above translates to parallel proc
calc expression!
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public void write(Object newVal) {
// COMMUNICATION{x & [... & write...] ==> Cell(run, newVal)
instance(new CELL_(_self, newVal));
Modified:
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CellChannelListener.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CellChannelListener.java?rev=1424264&r1=1424263&r2=1424264&view=diff
==============================================================================
---
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CellChannelListener.java
(original)
+++
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CellChannelListener.java
Thu Dec 20 01:39:16 2012
@@ -16,6 +16,7 @@ package org.apache.ode.jacob.examples.ce
* @see org.apache.ode.jacob.examples.cell.Cell
* @see org.apache.ode.jacob.examples.cell.CellChannel
*/
+@SuppressWarnings("serial")
public abstract class CellChannelListener
extends
org.apache.ode.jacob.ChannelListener<org.apache.ode.jacob.examples.cell.CellChannel>
implements org.apache.ode.jacob.examples.cell.Cell
Modified:
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java?rev=1424264&r1=1424263&r2=1424264&view=diff
==============================================================================
---
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java
(original)
+++
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java
Thu Dec 20 01:39:16 2012
@@ -55,7 +55,8 @@ public class JacobCellTest extends TestC
assertEquals("foo", _val);
}
- static class CellTest1 extends JacobRunnable {
+ @SuppressWarnings("serial")
+static class CellTest1 extends JacobRunnable {
public void run() {
CellChannel cellChannel = newChannel(CellChannel.class, "cell");
ValChannel retChannel = newChannel(ValChannel.class, "val");
Modified:
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStreamChannelListener.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStreamChannelListener.java?rev=1424264&r1=1424263&r2=1424264&view=diff
==============================================================================
---
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStreamChannelListener.java
(original)
+++
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStreamChannelListener.java
Thu Dec 20 01:39:16 2012
@@ -16,6 +16,7 @@ package org.apache.ode.jacob.examples.er
* @see org.apache.ode.jacob.examples.eratosthenes.NaturalNumberStream
* @see org.apache.ode.jacob.examples.eratosthenes.NaturalNumberStreamChannel
*/
+@SuppressWarnings("serial")
public abstract class NaturalNumberStreamChannelListener
extends
org.apache.ode.jacob.ChannelListener<org.apache.ode.jacob.examples.eratosthenes.NaturalNumberStreamChannel>
implements org.apache.ode.jacob.examples.eratosthenes.NaturalNumberStream
Modified:
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java?rev=1424264&r1=1424263&r2=1424264&view=diff
==============================================================================
---
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java
(original)
+++
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java
Thu Dec 20 01:39:16 2012
@@ -25,6 +25,7 @@ import org.apache.ode.jacob.SynchChannel
/**
* Abstract process that executes a number of steps sequentially.
*/
+@SuppressWarnings("serial")
public abstract class Sequence extends JacobRunnable {
private int _steps;
private int _current;
Modified:
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrintChannelListener.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrintChannelListener.java?rev=1424264&r1=1424263&r2=1424264&view=diff
==============================================================================
---
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrintChannelListener.java
(original)
+++
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrintChannelListener.java
Thu Dec 20 01:39:16 2012
@@ -16,6 +16,7 @@ package org.apache.ode.jacob.examples.sy
* @see org.apache.ode.jacob.examples.synch.SynchPrint
* @see org.apache.ode.jacob.examples.synch.SynchPrintChannel
*/
+@SuppressWarnings("serial")
public abstract class SynchPrintChannelListener
extends
org.apache.ode.jacob.ChannelListener<org.apache.ode.jacob.examples.synch.SynchPrintChannel>
implements org.apache.ode.jacob.examples.synch.SynchPrint
Modified:
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java?rev=1424264&r1=1424263&r2=1424264&view=diff
==============================================================================
---
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
(original)
+++
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
Thu Dec 20 01:39:16 2012
@@ -55,6 +55,7 @@ public class SynchPrinter {
public static final class Tester extends JacobRunnable {
private static final long serialVersionUID = 7899682832271627464L;
+ @SuppressWarnings("serial")
public void run() {
final SynchPrintChannel p = newChannel(SynchPrintChannel.class);
instance(new SystemPrinter(p));
