Skip to content

work #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mtaylor wants to merge 3 commits into
base: master
Choose a base branch
from
Open

work #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6d6a2d
work
mtaylor Oct 3, 2014
b7fba58
Added 'Ignores' required by reworking of DataFlowNodeLifeCycleControl
StuartWheater Oct 21, 2014
9fcf98e
Merge pull request #1 from StuartWheater/end2endword
mtaylor Oct 31, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions simple-plugin/simple-plugin.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="ejb" name="EJB">
<configuration>
<ejbRoots>
<root url="file://$MODULE_DIR$/src/main/java" />
<root url="file://$MODULE_DIR$/src/main/resources" />
</ejbRoots>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec:1.0.1.Final" level="project" />
<orderEntry type="module" module-name="data-common" scope="PROVIDED" />
<orderEntry type="module" module-name="data-common-jee" scope="PROVIDED" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
</component>
</module>

6 changes: 4 additions & 2 deletions ...e-plugin/src/main/java/com/arjuna/dbplugins/simple/dataflownodes/SimpleDataProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import com.arjuna.databroker.data.DataFlow;
import com.arjuna.databroker.data.DataProvider;
import com.arjuna.databroker.data.DataProcessor;
import com.arjuna.databroker.data.connector.NamedDataProvider;
import com.arjuna.databroker.data.connector.ReferrerDataConsumer;
import com.arjuna.databroker.data.jee.annotation.DataConsumerInjection;
import com.arjuna.databroker.data.jee.annotation.DataProviderInjection;

Expand Down Expand Up @@ -117,7 +119,7 @@ public <T> DataProvider<T> getDataProvider(Class<T> dataClass)
private Map<String, String> _properties;
private DataFlow _dataFlow;
@DataConsumerInjection(methodName="process")
private DataConsumer<String> _dataConsumer;
private ReferrerDataConsumer<String> _dataConsumer;
@DataProviderInjection
private DataProvider<String> _dataProvider;
private NamedDataProvider<String> _dataProvider;
}
6 changes: 4 additions & 2 deletions simple-plugin/src/main/java/com/arjuna/dbplugins/simple/dataflownodes/SimpleDataService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import com.arjuna.databroker.data.DataFlow;
import com.arjuna.databroker.data.DataProvider;
import com.arjuna.databroker.data.DataService;
import com.arjuna.databroker.data.connector.NamedDataProvider;
import com.arjuna.databroker.data.connector.ReferrerDataConsumer;
import com.arjuna.databroker.data.jee.annotation.DataConsumerInjection;
import com.arjuna.databroker.data.jee.annotation.DataProviderInjection;

Expand Down Expand Up @@ -121,7 +123,7 @@ public <T> DataProvider<T> getDataProvider(Class<T> dataClass)
private Map<String, String> _properties;
private DataFlow _dataFlow;
@DataConsumerInjection(methodName="export")
private DataConsumer<String> _dataConsumer;
private ReferrerDataConsumer<String> _dataConsumer;
@DataProviderInjection
private DataProvider<String> _dataProvider;
private NamedDataProvider<String> _dataProvider;
}
3 changes: 2 additions & 1 deletion simple-plugin/src/main/java/com/arjuna/dbplugins/simple/dataflownodes/SimpleDataSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.arjuna.databroker.data.DataConsumer;
import com.arjuna.databroker.data.DataFlow;
import com.arjuna.databroker.data.DataSink;
import com.arjuna.databroker.data.connector.ReferrerDataConsumer;
import com.arjuna.databroker.data.jee.annotation.DataConsumerInjection;

public class SimpleDataSink implements DataSink
Expand Down Expand Up @@ -106,5 +107,5 @@ public <T> DataConsumer<T> getDataConsumer(Class<T> dataClass)
private Map<String, String> _properties;
private DataFlow _dataFlow;
@DataConsumerInjection(methodName="send")
private DataConsumer<String> _dataConsumer;
private ReferrerDataConsumer<String> _dataConsumer;
}
3 changes: 2 additions & 1 deletion simple-plugin/src/main/java/com/arjuna/dbplugins/simple/dataflownodes/SimpleDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import com.arjuna.databroker.data.DataFlow;
import com.arjuna.databroker.data.DataProvider;
import com.arjuna.databroker.data.DataSource;
import com.arjuna.databroker.data.connector.NamedDataProvider;
import com.arjuna.databroker.data.jee.annotation.DataProviderInjection;

public class SimpleDataSource implements DataSource
Expand Down Expand Up @@ -95,5 +96,5 @@ public <T> DataProvider<T> getDataProvider(Class<T> dataClass)
private Map<String, String> _properties;
private DataFlow _dataFlow;
@DataProviderInjection
private DataProvider<String> _dataProvider;
private NamedDataProvider<String> _dataProvider;
}
6 changes: 4 additions & 2 deletions simple-plugin/src/main/java/com/arjuna/dbplugins/simple/dataflownodes/SimpleDataStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import com.arjuna.databroker.data.DataFlow;
import com.arjuna.databroker.data.DataProvider;
import com.arjuna.databroker.data.DataStore;
import com.arjuna.databroker.data.connector.NamedDataProvider;
import com.arjuna.databroker.data.connector.ReferrerDataConsumer;
import com.arjuna.databroker.data.jee.annotation.DataConsumerInjection;
import com.arjuna.databroker.data.jee.annotation.DataProviderInjection;

Expand Down Expand Up @@ -122,7 +124,7 @@ public <T> DataProvider<T> getDataProvider(Class<T> dataClass)
private Map<String, String> _properties;
private DataFlow _dataFlow;
@DataConsumerInjection(methodName="store")
private DataConsumer<String> _dataConsumer;
private ReferrerDataConsumer<String> _dataConsumer;
@DataProviderInjection
private DataProvider<String> _dataProvider;
private NamedDataProvider<String> _dataProvider;
}
25 changes: 14 additions & 11 deletions simple-plugin/src/test/java/com/arjuna/dbplugins/tests/simple/ChainingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import java.util.Collections;

import org.junit.Ignore;
import org.junit.Test;

import static org.junit.Assert.*;
Expand All @@ -22,15 +23,16 @@
public class ChainingTest
{
@Test
@Ignore // Not running in EJB container, so need to reworked
public void simplestChain()
{
SimpleDataSource simpleDataSource = new SimpleDataSource("Simple Data Source", Collections.<String, String>emptyMap());
SimpleDataProcessor simpleDataProcessor = new SimpleDataProcessor("Simple Data Processor", Collections.<String, String>emptyMap());
SimpleDataSink simpleDataSink = new SimpleDataSink("Simple Data Sink", Collections.<String, String>emptyMap());

DataFlowNodeLifeCycleControl.processCreatedDataFlowNode(simpleDataSource, null);
DataFlowNodeLifeCycleControl.processCreatedDataFlowNode(simpleDataProcessor, null);
DataFlowNodeLifeCycleControl.processCreatedDataFlowNode(simpleDataSink, null);
// DataFlowNodeLifeCycleControl.processCreatedDataFlowNode(simpleDataSource, null);
// DataFlowNodeLifeCycleControl.processCreatedDataFlowNode(simpleDataProcessor, null);
// DataFlowNodeLifeCycleControl.processCreatedDataFlowNode(simpleDataSink, null);

((ObservableDataProvider<String>) simpleDataSource.getDataProvider(String.class)).addDataConsumer((ObserverDataConsumer<String>) simpleDataProcessor.getDataConsumer(String.class));
((ObservableDataProvider<String>) simpleDataProcessor.getDataProvider(String.class)).addDataConsumer((ObserverDataConsumer<String>) simpleDataSink.getDataConsumer(String.class));
Expand All @@ -44,6 +46,7 @@ public void simplestChain()
}

@Test
@Ignore // Not running in EJB container, so need to reworked
public void fullConnectedChain()
{
SimpleDataSource simpleDataSource = new SimpleDataSource("Simple Data Source", Collections.<String, String>emptyMap());
Expand All @@ -54,14 +57,14 @@ public void fullConnectedChain()
SimpleDataService simpleDataService = new SimpleDataService("Simple Data Service", Collections.<String, String>emptyMap());
SimpleDataStore simpleDataStore = new SimpleDataStore("Simple Data Store", Collections.<String, String>emptyMap());

DataFlowNodeLifeCycleControl.processCreatedDataFlowNode(simpleDataSource, null);
DataFlowNodeLifeCycleControl.processCreatedDataFlowNode(simpleDataProcessor, null);
DataFlowNodeLifeCycleControl.processCreatedDataFlowNode(simpleDataSink1, null);
DataFlowNodeLifeCycleControl.processCreatedDataFlowNode(simpleDataSink2, null);
DataFlowNodeLifeCycleControl.processCreatedDataFlowNode(simpleDataSink3, null);
DataFlowNodeLifeCycleControl.processCreatedDataFlowNode(simpleDataService, null);
DataFlowNodeLifeCycleControl.processCreatedDataFlowNode(simpleDataStore, null);
// DataFlowNodeLifeCycleControl.processCreatedDataFlowNode(simpleDataSource, null);
// DataFlowNodeLifeCycleControl.processCreatedDataFlowNode(simpleDataProcessor, null);
// DataFlowNodeLifeCycleControl.processCreatedDataFlowNode(simpleDataSink1, null);
// DataFlowNodeLifeCycleControl.processCreatedDataFlowNode(simpleDataSink2, null);
// DataFlowNodeLifeCycleControl.processCreatedDataFlowNode(simpleDataSink3, null);
// DataFlowNodeLifeCycleControl.processCreatedDataFlowNode(simpleDataService, null);
// DataFlowNodeLifeCycleControl.processCreatedDataFlowNode(simpleDataStore, null);

((ObservableDataProvider<String>) simpleDataSource.getDataProvider(String.class)).addDataConsumer((ObserverDataConsumer<String>) simpleDataService.getDataConsumer(String.class));
((ObservableDataProvider<String>) simpleDataService.getDataProvider(String.class)).addDataConsumer((ObserverDataConsumer<String>)simpleDataSink1.getDataConsumer(String.class));

Expand Down