Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Update Hibernate to 7.2.0 (#2419)

Eric Bariaux5dcb26d84d79
diff --git a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BluetoothMeshProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BluetoothMeshProtocol.java
index 500e528d1..1bf447711 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BluetoothMeshProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/bluetooth/mesh/BluetoothMeshProtocol.java
@@ -119,7 +119,15 @@ public class BluetoothMeshProtocol extends AbstractProtocol<BluetoothMeshAgent,
}
}
};
- private static final BluetoothCentralManager bluetoothCentral = new BluetoothCentralManager(bluetoothManagerCallback);
+ private static BluetoothCentralManager bluetoothCentral;
+ private static synchronized BluetoothCentralManager bluetoothCentral() {
+ if (bluetoothCentral == null) {
+ bluetoothCentral = new BluetoothCentralManager(bluetoothManagerCallback);
+ }
+ return bluetoothCentral;
+ }
+
+
private static final List<BluetoothMeshNetwork> networkList = new LinkedList<>();
// Not ideal this but will do for now
private static SequenceNumberPersistencyManager sequenceNumberManager;
@@ -243,7 +251,7 @@ public class BluetoothMeshProtocol extends AbstractProtocol<BluetoothMeshAgent,
}
BluetoothMeshProtocol.initMainThread(scheduledExecutorService);
meshNetwork = new BluetoothMeshNetwork(
- BluetoothMeshProtocol.bluetoothCentral, BluetoothMeshProtocol.sequenceNumberManager, BluetoothMeshProtocol.mainThread,
+ BluetoothMeshProtocol.bluetoothCentral(), BluetoothMeshProtocol.sequenceNumberManager, BluetoothMeshProtocol.mainThread,
proxyAddress, sourceAddress, networkKey, applicationKeyMap, mtuParam, oldSequenceNumber, executorService, scheduledExecutorService, statusConsumer
);
BluetoothMeshProtocol.addNetwork(meshNetwork);
diff --git a/container/src/main/java/org/openremote/container/persistence/IntegratorProvider.java b/container/src/main/java/org/openremote/container/persistence/IntegratorProvider.java
index ff4882f70..f9b3c9ddf 100644
--- a/container/src/main/java/org/openremote/container/persistence/IntegratorProvider.java
+++ b/container/src/main/java/org/openremote/container/persistence/IntegratorProvider.java
@@ -20,6 +20,7 @@
package org.openremote.container.persistence;
import org.hibernate.boot.Metadata;
+import org.hibernate.boot.spi.BootstrapContext;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.event.service.spi.EventListenerRegistry;
import org.hibernate.event.spi.EventType;
@@ -38,8 +39,11 @@ public class IntegratorProvider implements org.hibernate.jpa.boot.spi.Integrator
}
@Override
- public void integrate(Metadata metadata, SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {
- final EventListenerRegistry eventListenerRegistry = serviceRegistry.getService(EventListenerRegistry.class);
+
+ public void integrate(Metadata metadata, BootstrapContext bootstrapContext, SessionFactoryImplementor sessionFactory) {
+ final EventListenerRegistry eventListenerRegistry = sessionFactory
+ .getServiceRegistry()
+ .getService(EventListenerRegistry.class);
// Replace the flush entity listeners which removes the standard DefaultFlushEntityEventListener
eventListenerRegistry.setListeners(
diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
index 7482d7532..ad080b838 100644
--- a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java
@@ -119,6 +119,16 @@ public class PersistenceService implements ContainerService, Consumer<Persistenc
return "org.hibernate.jpa.HibernatePersistenceProvider";
}
+ @Override
+ public String getScopeAnnotationName() {
+ return null;
+ }
+
+ @Override
+ public List<String> getQualifierAnnotationNames() {
+ return List.of();
+ }
+
@Override
public PersistenceUnitTransactionType getTransactionType() {
return PersistenceUnitTransactionType.RESOURCE_LOCAL;
diff --git a/gradle.properties b/gradle.properties
index dfe6aaa30..e85454d2d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,8 +23,8 @@ jacksonVersion = 2.20.1
groovyVersion = 4.0.24
groovySandboxVersion = 4.2.2
sqliteVersion = 3.51.1.0
-hibernateVersion = 6.6.11.Final
-hibernateValidatorVersion = 8.0.2.Final
+hibernateVersion = 7.2.0.Final
+hibernateValidatorVersion = 9.1.0.Final
hikaricpVersion = 6.2.1
postgresJdbcVersion = 42.7.8
spockVersion = 2.4-M5-groovy-4.0
diff --git a/model/src/main/java/org/openremote/model/alarm/SentAlarm.java b/model/src/main/java/org/openremote/model/alarm/SentAlarm.java
index b5fea2734..0f9c43b25 100644
--- a/model/src/main/java/org/openremote/model/alarm/SentAlarm.java
+++ b/model/src/main/java/org/openremote/model/alarm/SentAlarm.java
@@ -35,7 +35,8 @@ import static org.openremote.model.Constants.PERSISTENCE_SEQUENCE_ID_GENERATOR;
public class SentAlarm {
@Id
@Column(name = "ID")
- @GeneratedValue(generator = PERSISTENCE_SEQUENCE_ID_GENERATOR)
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = PERSISTENCE_SEQUENCE_ID_GENERATOR)
+ @SequenceGenerator(name = PERSISTENCE_SEQUENCE_ID_GENERATOR, initialValue = 1000, allocationSize = 1)
protected Long id;
@NotNull
diff --git a/model/src/main/java/org/openremote/model/attribute/AttributeMap.java b/model/src/main/java/org/openremote/model/attribute/AttributeMap.java
index c979fde31..f1e8c78bf 100644
--- a/model/src/main/java/org/openremote/model/attribute/AttributeMap.java
+++ b/model/src/main/java/org/openremote/model/attribute/AttributeMap.java
@@ -27,7 +27,7 @@ import java.util.Collection;
import java.util.Map;
import java.util.Optional;
-public class AttributeMap extends NamedMap<Attribute<?>> {
+public class AttributeMap extends NamedMap<String, Attribute<?>> {
public AttributeMap() {
}
diff --git a/model/src/main/java/org/openremote/model/attribute/MetaMap.java b/model/src/main/java/org/openremote/model/attribute/MetaMap.java
index 1d609bc91..23f767fc7 100644
--- a/model/src/main/java/org/openremote/model/attribute/MetaMap.java
+++ b/model/src/main/java/org/openremote/model/attribute/MetaMap.java
@@ -33,7 +33,7 @@ import java.util.*;
import java.util.function.Function;
@JsonDeserialize(using = MetaMap.MetaObjectDeserializer.class)
-public class MetaMap extends NamedMap<MetaItem<?>> {
+public class MetaMap extends NamedMap<String, MetaItem<?>> {
/**
* Deserialise a {@link MetaMap} that is represented as a JSON object where each key is the name of a
* {@link MetaItemDescriptor}
diff --git a/model/src/main/java/org/openremote/model/attribute/NamedMap.java b/model/src/main/java/org/openremote/model/attribute/NamedMap.java
index 3b15b5b93..ff4cd473d 100644
--- a/model/src/main/java/org/openremote/model/attribute/NamedMap.java
+++ b/model/src/main/java/org/openremote/model/attribute/NamedMap.java
@@ -35,7 +35,7 @@ import java.util.stream.Stream;
/**
* Special map for {@link NameHolder} items where item names are used as map keys.
*/
-public class NamedMap<T extends AbstractNameValueHolder<?>> extends ForwardingMap<String, T> implements Serializable {
+public class NamedMap<K, T extends AbstractNameValueHolder<?>> extends ForwardingMap<String, T> implements Serializable {
protected Map<String, T> delegate = new HashMap<>();
diff --git a/model/src/main/java/org/openremote/model/persistence/LTreeType.java b/model/src/main/java/org/openremote/model/persistence/LTreeType.java
index 117ba7e63..c380b8e62 100644
--- a/model/src/main/java/org/openremote/model/persistence/LTreeType.java
+++ b/model/src/main/java/org/openremote/model/persistence/LTreeType.java
@@ -20,8 +20,8 @@
package org.openremote.model.persistence;
import org.hibernate.HibernateException;
-import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.usertype.UserType;
+import org.hibernate.type.descriptor.WrapperOptions;
import java.io.Serializable;
import java.sql.PreparedStatement;
@@ -55,13 +55,13 @@ public class LTreeType implements UserType<String[]> {
}
@Override
- public String[] nullSafeGet(ResultSet rs, int position, SharedSessionContractImplementor session, Object owner) throws SQLException {
+ public String[] nullSafeGet(ResultSet rs, int position, WrapperOptions options) throws SQLException {
String ltreeStr = rs.getString(position);
return ltreeStr != null ? ltreeStr.split("\\.") : null;
}
@Override
- public void nullSafeSet(PreparedStatement st, String[] value, int index, SharedSessionContractImplementor session) throws HibernateException, SQLException {
+ public void nullSafeSet(PreparedStatement st, String[] value, int index, WrapperOptions options) throws HibernateException, SQLException {
st.setObject(index, value != null ? String.join(".", value) : null, Types.OTHER);
}