This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new 95b4b40 ISIS-2020: update to latest DataNucleus
95b4b40 is described below
commit 95b4b404e98ee03a8303bb20007991eb7537bc0a
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Wed Nov 7 08:59:56 2018 +0100
ISIS-2020: update to latest DataNucleus
dn5-jdo-api.version -> 3.2.0-m10
dn5-core.version -> 5.2.0-m2
dn5-api-jdo.version -> 5.2.0-m2
dn5-jdo-query.version -> 5.0.8
dn5-rdbms.version -> 5.2.0-m2
dn5-jodatime.version -> 5.2.0-m1
also dealing with the fact, that some DN classes and methods have been
renamed
Task-Url: https://issues.apache.org/jira/browse/ISIS-2020
---
.../valuemappings/ByteArrayBlobRdbmsMapping.java | 4 ++--
.../datanucleus/valuetypes/IsisBlobMapping.java | 20 ++++++++++----------
.../datanucleus/valuetypes/IsisClobMapping.java | 22 +++++++++++-----------
.../datanucleus/valuetypes/IsisMoneyMapping.java | 22 +++++++++++-----------
core/pom.xml | 12 ++++++------
example/application/helloworld/pom.xml | 7 +++----
example/application/simpleapp/pom.xml | 7 +++----
7 files changed, 46 insertions(+), 48 deletions(-)
diff --git
a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuemappings/ByteArrayBlobRdbmsMapping.java
b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuemappings/ByteArrayBlobRdbmsMapping.java
index da165f0..85e75ac 100644
---
a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuemappings/ByteArrayBlobRdbmsMapping.java
+++
b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuemappings/ByteArrayBlobRdbmsMapping.java
@@ -19,11 +19,11 @@
package org.apache.isis.objectstore.jdo.datanucleus.valuemappings;
import org.datanucleus.store.rdbms.RDBMSStoreManager;
-import org.datanucleus.store.rdbms.mapping.datastore.BlobRDBMSMapping;
+import org.datanucleus.store.rdbms.mapping.column.BlobColumnMapping;
import org.datanucleus.store.rdbms.mapping.java.JavaTypeMapping;
import org.datanucleus.store.rdbms.table.Column;
-public class ByteArrayBlobRdbmsMapping extends BlobRDBMSMapping {
+public class ByteArrayBlobRdbmsMapping extends BlobColumnMapping {
public ByteArrayBlobRdbmsMapping(JavaTypeMapping mapping,
RDBMSStoreManager storeMgr, Column col) {
super(mapping, storeMgr, col);
diff --git
a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java
b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java
index 65215fb..05669da 100644
---
a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java
+++
b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java
@@ -65,7 +65,7 @@ public class IsisBlobMapping extends SingleFieldMultiMapping {
@Override
- public Object getValueForDatastoreMapping(NucleusContext nucleusCtx, int
index, Object value)
+ public Object getValueForColumnMapping(NucleusContext nucleusCtx, int
index, Object value)
{
Blob blob = ((Blob)value);
switch (index) {
@@ -81,8 +81,8 @@ public class IsisBlobMapping extends SingleFieldMultiMapping {
{
Blob blob = ((Blob)value);
if (blob == null) {
- getDatastoreMapping(0).setString(preparedStmt, exprIndex[0], null);
- getDatastoreMapping(1).setString(preparedStmt, exprIndex[1], null);
+ getColumnMapping(0).setString(preparedStmt, exprIndex[0], null);
+ getColumnMapping(1).setString(preparedStmt, exprIndex[1], null);
// using:
// getDatastoreMapping(2).setObject(preparedStmt, exprIndex[2],
null);
@@ -94,9 +94,9 @@ public class IsisBlobMapping extends SingleFieldMultiMapping {
// ignore
}
} else {
- getDatastoreMapping(0).setString(preparedStmt, exprIndex[0],
blob.getName());
- getDatastoreMapping(1).setString(preparedStmt, exprIndex[1],
blob.getMimeType().getBaseType());
- getDatastoreMapping(2).setObject(preparedStmt, exprIndex[2],
blob.getBytes());
+ getColumnMapping(0).setString(preparedStmt, exprIndex[0],
blob.getName());
+ getColumnMapping(1).setString(preparedStmt, exprIndex[1],
blob.getMimeType().getBaseType());
+ getColumnMapping(2).setObject(preparedStmt, exprIndex[2],
blob.getBytes());
}
}
@@ -106,7 +106,7 @@ public class IsisBlobMapping extends
SingleFieldMultiMapping {
try
{
// Check for null entries
- if (getDatastoreMapping(0).getObject(resultSet, exprIndex[0]) ==
null)
+ if (getColumnMapping(0).getObject(resultSet, exprIndex[0]) == null)
{
return null;
}
@@ -116,9 +116,9 @@ public class IsisBlobMapping extends
SingleFieldMultiMapping {
// Do nothing
}
- final String name = getDatastoreMapping(0).getString(resultSet,
exprIndex[0]);
- final String mimeTypeBase =
getDatastoreMapping(1).getString(resultSet, exprIndex[1]);
- final byte[] bytes = (byte[])
getDatastoreMapping(2).getObject(resultSet, exprIndex[2]);
+ final String name = getColumnMapping(0).getString(resultSet,
exprIndex[0]);
+ final String mimeTypeBase = getColumnMapping(1).getString(resultSet,
exprIndex[1]);
+ final byte[] bytes = (byte[]) getColumnMapping(2).getObject(resultSet,
exprIndex[2]);
if(name == null || mimeTypeBase == null || bytes == null) {
return null;
}
diff --git
a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisClobMapping.java
b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisClobMapping.java
index 7f21150..a6c787f 100644
---
a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisClobMapping.java
+++
b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisClobMapping.java
@@ -64,7 +64,7 @@ public class IsisClobMapping extends SingleFieldMultiMapping {
}
@Override
- public Object getValueForDatastoreMapping(NucleusContext nucleusCtx, int
index, Object value)
+ public Object getValueForColumnMapping(NucleusContext nucleusCtx, int
index, Object value)
{
Clob clob = ((Clob)value);
switch (index) {
@@ -80,13 +80,13 @@ public class IsisClobMapping extends
SingleFieldMultiMapping {
{
Clob clob = ((Clob)value);
if (clob == null) {
- getDatastoreMapping(0).setObject(preparedStmt, exprIndex[0], null);
- getDatastoreMapping(1).setObject(preparedStmt, exprIndex[1], null);
- getDatastoreMapping(2).setObject(preparedStmt, exprIndex[2], null);
+ getColumnMapping(0).setObject(preparedStmt, exprIndex[0], null);
+ getColumnMapping(1).setObject(preparedStmt, exprIndex[1], null);
+ getColumnMapping(2).setObject(preparedStmt, exprIndex[2], null);
} else {
- getDatastoreMapping(0).setString(preparedStmt, exprIndex[0],
clob.getName());
- getDatastoreMapping(1).setString(preparedStmt, exprIndex[1],
clob.getMimeType().getBaseType());
- getDatastoreMapping(2).setObject(preparedStmt, exprIndex[2],
clob.getChars().toString());
+ getColumnMapping(0).setString(preparedStmt, exprIndex[0],
clob.getName());
+ getColumnMapping(1).setString(preparedStmt, exprIndex[1],
clob.getMimeType().getBaseType());
+ getColumnMapping(2).setObject(preparedStmt, exprIndex[2],
clob.getChars().toString());
}
}
@@ -96,7 +96,7 @@ public class IsisClobMapping extends SingleFieldMultiMapping {
try
{
// Check for null entries
- if (getDatastoreMapping(0).getObject(resultSet, exprIndex[0]) ==
null)
+ if (getColumnMapping(0).getObject(resultSet, exprIndex[0]) == null)
{
return null;
}
@@ -106,9 +106,9 @@ public class IsisClobMapping extends
SingleFieldMultiMapping {
// Do nothing
}
- final String name = getDatastoreMapping(0).getString(resultSet,
exprIndex[0]);
- final String mimeTypeBase =
getDatastoreMapping(1).getString(resultSet, exprIndex[1]);
- final String str = getDatastoreMapping(2).getString(resultSet,
exprIndex[2]);
+ final String name = getColumnMapping(0).getString(resultSet,
exprIndex[0]);
+ final String mimeTypeBase = getColumnMapping(1).getString(resultSet,
exprIndex[1]);
+ final String str = getColumnMapping(2).getString(resultSet,
exprIndex[2]);
if(name == null || mimeTypeBase == null || str == null) {
return null;
}
diff --git
a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisMoneyMapping.java
b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisMoneyMapping.java
index 48f1102..d9ac6bf 100644
---
a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisMoneyMapping.java
+++
b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisMoneyMapping.java
@@ -73,15 +73,15 @@ public class IsisMoneyMapping extends
SingleFieldMultiMapping {
final MappingManager mgr = getStoreManager().getMappingManager();
Column column = null;
if (table != null) {
- column = mgr.createColumn(this, typeName,
getNumberOfDatastoreMappings());
+ column = mgr.createColumn(this, typeName,
getNumberOfColumnMappings());
/* TODO metaData.setJdbcType("NCHAR") */
column.setColumnMetaData(column.getColumnMetaData().setLength(columnLength));
}
- mgr.createDatastoreMapping(this, column, typeName);
+ mgr.createColumnMapping(this, column, typeName);
}
@Override
- public Object getValueForDatastoreMapping(final NucleusContext nucleusCtx,
final int index, final Object value) {
+ public Object getValueForColumnMapping(final NucleusContext nucleusCtx,
final int index, final Object value) {
final Money m = ((Money) value);
switch (index) {
@@ -99,11 +99,11 @@ public class IsisMoneyMapping extends
SingleFieldMultiMapping {
if (value instanceof Money) {
final Money m = ((Money) value);
- getDatastoreMapping(0).setLong(preparedStmt, exprIndex[0],
m.longValue());
- getDatastoreMapping(1).setString(preparedStmt, exprIndex[1],
m.getCurrency());
+ getColumnMapping(0).setLong(preparedStmt, exprIndex[0],
m.longValue());
+ getColumnMapping(1).setString(preparedStmt, exprIndex[1],
m.getCurrency());
} else {
- getDatastoreMapping(0).setLong(preparedStmt, exprIndex[0], 0l);
- getDatastoreMapping(1).setString(preparedStmt, exprIndex[1], null);
+ getColumnMapping(0).setLong(preparedStmt, exprIndex[0], 0l);
+ getColumnMapping(1).setString(preparedStmt, exprIndex[1], null);
}
}
@@ -112,16 +112,16 @@ public class IsisMoneyMapping extends
SingleFieldMultiMapping {
try {
// Check for null entries
- if (getDatastoreMapping(0).getObject(resultSet, exprIndex[0]) ==
null
- || getDatastoreMapping(1).getObject(resultSet,
exprIndex[1]) == null) {
+ if (getColumnMapping(0).getObject(resultSet, exprIndex[0]) == null
+ || getColumnMapping(1).getObject(resultSet, exprIndex[1])
== null) {
return null;
}
} catch (final Exception e) {
// Do nothing
}
- final long amount = getDatastoreMapping(0).getLong(resultSet,
exprIndex[0]);
- final String currency = getDatastoreMapping(1).getString(resultSet,
exprIndex[1]);
+ final long amount = getColumnMapping(0).getLong(resultSet,
exprIndex[0]);
+ final String currency = getColumnMapping(1).getString(resultSet,
exprIndex[1]);
if (currency == null) {
return null;
}
diff --git a/core/pom.xml b/core/pom.xml
index d6ce693..fe16668 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -94,12 +94,12 @@
<jdo-api.version>3.1</jdo-api.version>
<!-- Isis Datanucleus JDO Plugin dn5 -->
- <dn5-jdo-api.version>3.2.0-m8</dn5-jdo-api.version>
- <dn5-core.version>5.1.11</dn5-core.version>
- <dn5-api-jdo.version>5.1.9</dn5-api-jdo.version>
- <dn5-jdo-query.version>5.0.5</dn5-jdo-query.version>
- <dn5-rdbms.version>5.1.11</dn5-rdbms.version>
- <dn5-jodatime.version>5.1.0-release</dn5-jodatime.version>
+ <dn5-jdo-api.version>3.2.0-m10</dn5-jdo-api.version>
+ <dn5-core.version>5.2.0-m2</dn5-core.version>
+ <dn5-api-jdo.version>5.2.0-m2</dn5-api-jdo.version>
+ <dn5-jdo-query.version>5.0.8</dn5-jdo-query.version>
+ <dn5-rdbms.version>5.2.0-m2</dn5-rdbms.version>
+ <dn5-jodatime.version>5.2.0-m1</dn5-jodatime.version>
<dn5-maven-plugin.version>5.0.2</dn5-maven-plugin.version>
<!-- Isis Datanucleus JDO Plugin dn4 -->
diff --git a/example/application/helloworld/pom.xml
b/example/application/helloworld/pom.xml
index 4ba80de..a69f274 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -48,10 +48,9 @@
<jetty-maven-plugin.version>9.4.12.v20180830</jetty-maven-plugin.version>
<!-- override incode-build (see dn5-xxx.version in
isis-core-plugins-jdo-datanucleus-5) -->
- <datanucleus-api-jdo.version>5.1.9</datanucleus-api-jdo.version>
- <datanucleus-core.version>5.1.11</datanucleus-core.version>
- <datanucleus-api-jdo.version>5.1.9</datanucleus-api-jdo.version>
-
<datanucleus-jodatime.version>5.1.0-release</datanucleus-jodatime.version>
+ <datanucleus-api-jdo.version>5.2.0-m2</datanucleus-api-jdo.version>
+ <datanucleus-core.version>5.2.0-m2</datanucleus-core.version>
+ <datanucleus-jodatime.version>5.2.0-m1</datanucleus-jodatime.version>
<hsqldb.version>2.4.1</hsqldb.version>
<failOnMissingWebXml>false</failOnMissingWebXml>
diff --git a/example/application/simpleapp/pom.xml
b/example/application/simpleapp/pom.xml
index 2e34978..901b672 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -51,10 +51,9 @@
<jetty-maven-plugin.version>9.4.12.v20180830</jetty-maven-plugin.version>
<!-- override incode-build (see dn5-xxx.version in
isis-core-plugins-jdo-datanucleus-5) -->
- <datanucleus-api-jdo.version>5.1.9</datanucleus-api-jdo.version>
- <datanucleus-core.version>5.1.11</datanucleus-core.version>
- <datanucleus-api-jdo.version>5.1.9</datanucleus-api-jdo.version>
-
<datanucleus-jodatime.version>5.1.0-release</datanucleus-jodatime.version>
+ <datanucleus-api-jdo.version>5.2.0-m2</datanucleus-api-jdo.version>
+ <datanucleus-core.version>5.2.0-m2</datanucleus-core.version>
+ <datanucleus-jodatime.version>5.2.0-m1</datanucleus-jodatime.version>
<hsqldb.version>2.4.1</hsqldb.version>
<failOnMissingWebXml>false</failOnMissingWebXml>
