This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 90904bc6a DataNode.dataSourceFactory property is unneeded and
confusing - removing
90904bc6a is described below
commit 90904bc6a70fe4cdcb9d5f97aeb76459cb65b5b2
Author: Andrus Adamchik <[email protected]>
AuthorDate: Sun Aug 16 14:29:46 2026 -0400
DataNode.dataSourceFactory property is unneeded and confusing - removing
---
.../java/org/apache/cayenne/access/DataNode.java | 12 ---------
.../runtime/DefaultDataNodeFactory.java | 3 ---
.../org/apache/cayenne/access/DataNodeTest.java | 9 -------
.../org/apache/cayenne/access/MockDataNode.java | 29 ++++++----------------
.../runtime/DataDomainProviderIT.java | 1 -
5 files changed, 8 insertions(+), 46 deletions(-)
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/DataNode.java
b/cayenne/src/main/java/org/apache/cayenne/access/DataNode.java
index b9e85d777..68bd72355 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/DataNode.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/DataNode.java
@@ -61,7 +61,6 @@ public class DataNode {
protected String name;
protected DbAdapter adapter;
- protected String dataSourceFactory;
protected EntityResolver entityResolver;
protected EntitySorter entitySorter;
protected SchemaUpdateStrategy schemaUpdateStrategy;
@@ -142,17 +141,6 @@ public class DataNode {
this.name = name;
}
- /**
- * Returns a name of DataSourceFactory class for this node.
- */
- public String getDataSourceFactory() {
- return dataSourceFactory;
- }
-
- public void setDataSourceFactory(String dataSourceFactory) {
- this.dataSourceFactory = dataSourceFactory;
- }
-
/**
* Returns an unmodifiable collection of DataMaps handled by this DataNode.
*/
diff --git
a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDataNodeFactory.java
b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDataNodeFactory.java
index dcfc3a621..addbe3918 100644
---
a/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDataNodeFactory.java
+++
b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDataNodeFactory.java
@@ -96,12 +96,9 @@ public class DefaultDataNodeFactory implements
DataNodeFactory {
dataNode.setSqlTemplateTranslator(sqlTemplateTranslator);
DataSource dataSource =
dataSourceFactory.getDataSource(nodeDescriptor);
-
-
dataNode.setDataSourceFactory(nodeDescriptor.getDataSourceFactoryType());
dataNode.setDataSource(dataSource);
dataNode.setSchemaUpdateStrategy(schemaUpdateStrategyFactory.create(nodeDescriptor));
-
dataNode.setAdapter(adapterFactory.createAdapter(nodeDescriptor,
dataSource));
return dataNode;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataNodeTest.java
b/cayenne/src/test/java/org/apache/cayenne/access/DataNodeTest.java
index 02fd57b93..16f653144 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DataNodeTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DataNodeTest.java
@@ -41,15 +41,6 @@ public class DataNodeTest {
assertEquals("tst_name", node.getName());
}
- @Test
- public void dataSourceFactory() {
- DataNode node = new DataNode();
- assertNull(node.getDataSourceFactory());
-
- node.setDataSourceFactory("tst_name");
- assertEquals("tst_name", node.getDataSourceFactory());
- }
-
@Test
public void entityResolver() {
DataNode node = new DataNode();
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/MockDataNode.java
b/cayenne/src/test/java/org/apache/cayenne/access/MockDataNode.java
index 887a9c696..b13df4ae7 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/MockDataNode.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/MockDataNode.java
@@ -19,14 +19,6 @@
package org.apache.cayenne.access;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.PkGenerator;
import org.apache.cayenne.map.DataMap;
@@ -34,6 +26,12 @@ import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.map.EntitySorter;
import org.apache.cayenne.query.Query;
+import javax.sql.DataSource;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
public class MockDataNode extends DataNode {
protected DataDomain domain;
@@ -96,9 +94,8 @@ public class MockDataNode extends DataNode {
OperationObserver resultConsumer) {
// stick preset results to the consumer
- Iterator it = queries.iterator();
- while (it.hasNext()) {
- Query query = (Query) it.next();
+ for (Object o : queries) {
+ Query query = (Query) o;
resultConsumer.nextRows(query, (List) results.get(query));
}
}
@@ -133,11 +130,6 @@ public class MockDataNode extends DataNode {
return node.getDataSource();
}
- @Override
- public String getDataSourceFactory() {
- return node.getDataSourceFactory();
- }
-
@Override
public EntityResolver getEntityResolver() {
return node.getEntityResolver();
@@ -173,11 +165,6 @@ public class MockDataNode extends DataNode {
node.setDataSource(dataSource);
}
- @Override
- public void setDataSourceFactory(String dataSourceFactory) {
- node.setDataSourceFactory(dataSourceFactory);
- }
-
@Override
public void setEntityResolver(EntityResolver entityResolver) {
node.setEntityResolver(entityResolver);
diff --git
a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderIT.java
b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderIT.java
index 08889e730..c681eb2c6 100644
---
a/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderIT.java
@@ -107,7 +107,6 @@ public class DataDomainProviderIT {
DataDomain domain = env.runtime().getDataDomain();
for (DataNode node : domain.getDataNodes()) {
- assertEquals(XMLPoolingDataSourceFactory.class.getName(),
node.getDataSourceFactory());
assertNotNull(node.getDataSource());
assertNotNull(node.getAdapter());
}
