Skip to content

GitLab

Commit 9bb579a4 authored by Julian Zobel's avatar Julian Zobel
Browse files

Updates database-related Maven dependencies to work with Java Version 17

parent eb8066cd
Hide whitespace changes
Inline Side-by-side
pom.xml
View file @ 9bb579a4
......@@ -125,7 +125,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.9.1</version>
<version>2.12.2</version>
</dependency>
<!-- SVG -->
......@@ -159,6 +159,13 @@
<version>2.16.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.dom4j/dom4j -->
<dependency>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>2.1.3</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
......@@ -219,26 +226,27 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.14</version>
<version>8.0.30</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>4.3.10.Final</version>
<version>6.0.2.Final</version>
</dependency>
<!--
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.7.2</version>
</dependency>
-->
<!-- Glab Database -->
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.2.9</version>
<version>2.7.0</version>
</dependency>
<!-- Dependencies and convenience libraries -->
......
src/de/tud/kom/p2psim/impl/scenario/DefaultConfigurator.java
View file @ 9bb579a4
......@@ -232,7 +232,7 @@ public class DefaultConfigurator implements Configurator {
*/
}
factory.setNamespaceAware(false);
factory.setNamespaceAware(true);
factory.setValidating(false);
SAXParser parser = factory.newSAXParser();
......
src/de/tud/kom/p2psim/impl/topology/movement/aerial/MulticopterMovement.java
View file @ 9bb579a4
......@@ -25,9 +25,6 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.Map;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import de.tud.kom.p2psim.api.topology.movement.UAVMovementModel;
import de.tud.kom.p2psim.api.uav.MulticopterModel;
import de.tud.kom.p2psim.impl.energy.components.ActuatorComponent;
......@@ -36,6 +33,9 @@ import de.tud.kom.p2psim.impl.topology.util.PositionVector;
import de.tud.kom.p2psim.impl.util.db.metric.CustomMeasurement;
import de.tudarmstadt.maki.simonstrator.api.Time;
import de.tudarmstadt.maki.simonstrator.api.uavsupport.callbacks.ReachedLocationCallback;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;
/**
* Simplified thrust-based local movement model based on the Intel Aero UAV.
......
src/de/tud/kom/p2psim/impl/topology/movement/aerial/StateMulticopterMovement.java
View file @ 9bb579a4
......@@ -24,9 +24,9 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.Map;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;
import de.tud.kom.p2psim.api.topology.movement.UAVMovementModel;
import de.tud.kom.p2psim.api.uav.MulticopterModel;
......
src/de/tud/kom/p2psim/impl/util/db/dao/CommitThread.java
View file @ 9bb579a4
......@@ -23,8 +23,6 @@ package de.tud.kom.p2psim.impl.util.db.dao;
import java.util.Date;
import java.util.List;
import javax.persistence.EntityManager;
import org.hibernate.Session;
import de.tud.kom.p2psim.impl.util.db.metric.CustomMeasurement;
......
src/de/tud/kom/p2psim/impl/util/db/dao/DAO.java
View file @ 9bb579a4
......@@ -23,22 +23,12 @@ package de.tud.kom.p2psim.impl.util.db.dao;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import org.apache.commons.math3.analysis.function.Exp;
import org.hibernate.Criteria;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.Configuration;
import org.hibernate.criterion.Restrictions;
import org.hibernate.service.ServiceRegistry;
import de.tud.kom.p2psim.impl.util.db.metric.CustomMeasurement;
import de.tud.kom.p2psim.impl.util.db.metric.Experiment;
......@@ -58,6 +48,8 @@ import de.tud.kom.p2psim.impl.util.db.metric.MetricDescription;
import de.tudarmstadt.maki.simonstrator.api.Monitor;
import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
import de.tudarmstadt.maki.simonstrator.api.web.WebConfigurationManager;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
/**
* This class represents a simple access to persist objects with Hibernate. It
......@@ -70,6 +62,7 @@ import de.tudarmstadt.maki.simonstrator.api.web.WebConfigurationManager;
*
* @author Christoph Münker
* @author Andreas Hemel
* @author Julian Zobel
*/
public class DAO {
......@@ -137,22 +130,24 @@ public class DAO {
*/
cfg.setProperty("hibernate.show_sql", "false");
cfg.setProperty("hibernate.format_sql", "false");
cfg.setProperty("hibernate.connection.driver_class", "com.mysql.jdbc.Driver");
cfg.setProperty("hibernate.connection.driver_class", "com.mysql.cj.jdbc.Driver");
// Default user/pass/database, overwrite using MetricOutputDAO
cfg.setProperty("hibernate.connection.url", "jdbc:mysql://"+ address + ":" + port + "/" + database);
cfg.setProperty("hibernate.connection.username", username);
cfg.setProperty("hibernate.connection.password", password);
// mySQL 5
cfg.setProperty("hibernate.dialect",
"org.hibernate.dialect.MySQL5InnoDBDialect");
cfg.setProperty("hibernate.dialect", "org.hibernate.dialect.MySQL8Dialect");
cfg.setProperty("hibernate.transaction.factory_class",
"org.hibernate.transaction.JDBCTransactionFactory");
cfg.setProperty("hibernate.transaction.factory_class", "org.hibernate.transaction.JDBCTransactionFactory");
cfg.setProperty("hibernate.pool_size", "1");
cfg.setProperty("hibernate.hbm2ddl.auto", "update");
cfg.setProperty("hibernate.current_session_context_class", "thread");
// new org.hibernate.dialect.MySQLDialect();
// Add core classes
cfg.addAnnotatedClass(CustomMeasurement.class);
cfg.addAnnotatedClass(Experiment.class);
......@@ -321,8 +316,23 @@ public class DAO {
public static <T extends Object> List<T> retrieve(Class<T> pClass) {
begin();
Criteria criteria = getSession().createCriteria(pClass);
List<T> objects = criteria.list();
// using new JPA criteria API instead of old hibernate API
CriteriaBuilder builder = getSession().getCriteriaBuilder();
CriteriaQuery<T> criteriaQuery = builder.createQuery(pClass);
criteriaQuery.from(pClass);
List<T> objects = getSession().createQuery(criteriaQuery).getResultList();
/*
* deprecated code
*
* List<T> nickNames =
* entityManager.createQuery(criteria).getResultList();
*
* Criteria criteria = getSession().createCriteria(pClass); List<T>
* objects = criteria.list();
*/
commit();
return objects;
......@@ -449,8 +459,7 @@ public class DAO {
public static <T> T update(T o) {
commitQueue();
begin();
@SuppressWarnings("unchecked")
T objRef = (T) getSession().merge(o);
T objRef = getSession().merge(o);
commit();
close();
......
src/de/tud/kom/p2psim/impl/util/db/dao/metric/ExperimentDAO.java
View file @ 9bb579a4
......@@ -27,14 +27,14 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.hibernate.Criteria;
import org.hibernate.criterion.Restrictions;
import de.tud.kom.p2psim.impl.simengine.Simulator;
import de.tud.kom.p2psim.impl.util.db.dao.DAO;
import de.tud.kom.p2psim.impl.util.db.metric.Experiment;
import de.tud.kom.p2psim.impl.util.db.metric.Metric;
import de.tudarmstadt.maki.simonstrator.api.Time;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Root;
/**
* This class provides access to the single {@link Experiment} instance.
......@@ -98,18 +98,36 @@ public class ExperimentDAO extends DAO {
public static Experiment retrieveExperiment(long pSeed, Map<String, String> pVariables) {
begin();
Criteria criteria = getSession().createCriteria(Experiment.class);
criteria = criteria.add(Restrictions.eq("seed", pSeed));
// using new JPA criteria API instead of old hibernate API
CriteriaBuilder builder = getSession().getCriteriaBuilder();
CriteriaQuery<Experiment> criteriaQuery = builder.createQuery(Experiment.class);
Root<Experiment> root = criteriaQuery.from(Experiment.class);
criteriaQuery.select(root);
criteriaQuery.where(builder.equal(root.get("seed"), pSeed));
for (Entry<String, String> entry : pVariables.entrySet()) {
criteria = criteria.add(Restrictions.like("workload", "%" + entry.getKey() + "=" + entry.getValue() + "%"));
criteriaQuery.where(builder.like(root.get("workload"), "%" + entry.getKey() + "=" + entry.getValue() + "%"));
}
List<Experiment> experiments = criteria.list();
List<Experiment> experiments = getSession().createQuery(criteriaQuery).getResultList();
/*
* Criteria criteria = getSession().createCriteria(Experiment.class);
* criteria = criteria.add(Restrictions.eq("seed", pSeed)); for
* (Entry<String, String> entry : pVariables.entrySet()) { criteria =
* criteria.add(Restrictions.like("workload", "%" + entry.getKey() + "="
* + entry.getValue() + "%")); } List<Experiment> experiments =
* criteria.list();
*/
commit();
if (experiments.size() > 0) {
return experiments.get(experiments.size() - 1);
}
return null;
return null;
}
/** Called by the {@link Time} when the simulation is shut down. */
......
src/de/tud/kom/p2psim/impl/util/db/dao/metric/MetricDAO.java
View file @ 9bb579a4
......@@ -3,16 +3,16 @@ package de.tud.kom.p2psim.impl.util.db.dao.metric;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.hibernate.Criteria;
import org.hibernate.criterion.Restrictions;
import de.tud.kom.p2psim.impl.util.Tuple;
import de.tud.kom.p2psim.impl.util.db.dao.DAO;
import de.tud.kom.p2psim.impl.util.db.metric.Experiment;
import de.tud.kom.p2psim.impl.util.db.metric.Metric;
import de.tud.kom.p2psim.impl.util.db.metric.MetricDescription;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.ParameterExpression;
import jakarta.persistence.criteria.Root;
/** Data Access Object to store and retrieve {@link Metric} instances.
*
......@@ -61,11 +61,41 @@ public class MetricDAO extends DAO {
public static List<Metric> getMetricsForExperiment(int pExperimentID) {
begin();
Criteria criteria = getSession().createCriteria(Experiment.class);
if (pExperimentID != -1) {
criteria = criteria.add(Restrictions.eq("experimentID", pExperimentID));
}
List<Metric> metrics = criteria.list();
// using new JPA criteria API instead of old hibernate API
CriteriaBuilder builder = getSession().getCriteriaBuilder();
CriteriaQuery<Metric> criteriaQuery = builder.createQuery(Metric.class);
Root<Metric> root = criteriaQuery.from(Metric.class);
criteriaQuery.select(root);
criteriaQuery.where(builder.equal(root.get("experimentId"), pExperimentID));
List<Metric> metrics = getSession().createQuery(criteriaQuery).getResultList();
//
// List<Metric> metrics;
//
// if(pExperimentID != -1) {
// ParameterExpression<Integer> paramExperimentID = builder.parameter(Integer.class);
// criteriaQuery.select(root).where(builder.equal(root.get("experimentId"), paramExperimentID));
//
// //paramExperimentID.where(builder.equal(root.get("experimentId"), paramExperimentID));
//
// TypedQuery<Metric> q = getSession().createQuery(criteriaQuery);
// q.setParameter(paramExperimentID, pExperimentID);
//
// metrics = q.getResultList();
// }
// else {
// metrics = getSession().createQuery(criteriaQuery).getResultList();
// }
//
/*
* Criteria criteria = getSession().createCriteria(Experiment.class); if
* (pExperimentID != -1) { criteria =
* criteria.add(Restrictions.eq("experimentID", pExperimentID)); }
* List<Metric> metrics = criteria.list();
*/
commit();
return metrics;
}
......
src/de/tud/kom/p2psim/impl/util/db/metric/CustomMeasurement.java
View file @ 9bb579a4
......@@ -20,17 +20,17 @@
package de.tud.kom.p2psim.impl.util.db.metric;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Index;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Index;
import jakarta.persistence.Inheritance;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import jakarta.persistence.InheritanceType;
@Entity
@Table(name = "custom_measurements", indexes = { @Index(columnList = "hostMetricId", name = "hostMetricId") })
......@@ -46,7 +46,6 @@ public class CustomMeasurement implements HostMetricBound {
/**
* The simulation time for to this measurement in simulator time, that is, microseconds.
*/
@SuppressWarnings("unused")
protected long time;
/**
......@@ -70,7 +69,7 @@ public class CustomMeasurement implements HostMetricBound {
}
public void afterPersist() {
//
}
public HostMetric getHostMetric() {
......
src/de/tud/kom/p2psim/impl/util/db/metric/Experiment.java
View file @ 9bb579a4
......@@ -2,14 +2,13 @@ package de.tud.kom.p2psim.impl.util.db.metric;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Index;
import javax.persistence.Table;
import org.hibernate.annotations.Type;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Index;
import jakarta.persistence.Table;
/** Database representation of an experiment, that is, a simulator run.
*
......@@ -30,8 +29,8 @@ public class Experiment {
/**
* A unique id of this experiment, which will be set by the database.
*/
@Id
@GeneratedValue
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
/**
......@@ -63,14 +62,16 @@ public class Experiment {
/**
* The parsed XML-configuration
*/
@Type(type="text")
@Column(columnDefinition = "text")
//@Type(type="text")
private String system;
/**
* The variables of this experiment. (The variables of the XML-Config or
* variables which are given as parameter by start)
*/
@Type(type="text")
@Column(columnDefinition = "text")
//@Type(type="text")
private String workload;
/**
......
src/de/tud/kom/p2psim/impl/util/db/metric/GroupMetric.java
View file @ 9bb579a4
......@@ -20,14 +20,16 @@
package de.tud.kom.p2psim.impl.util.db.metric;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Index;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Index;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
@Entity
@Table(name = "groupmetrics", indexes = {
......@@ -44,7 +46,7 @@ import javax.persistence.Table;
public class GroupMetric {
@Id
@GeneratedValue
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
/**
......
src/de/tud/kom/p2psim/impl/util/db/metric/HostMetric.java
View file @ 9bb579a4
package de.tud.kom.p2psim.impl.util.db.metric;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Index;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Index;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
@Entity
@Table(name = "hostmetrics", indexes = {
......@@ -23,9 +24,8 @@ import javax.persistence.Table;
*/
public class HostMetric {
@SuppressWarnings("unused")
@Id
@GeneratedValue
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
private long hostId;
......
src/de/tud/kom/p2psim/impl/util/db/metric/Measurement.java
View file @ 9bb579a4
package de.tud.kom.p2psim.impl.util.db.metric;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Index;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.Index;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
/** Statistical representation of a series of measurements in the database.
*
......@@ -24,49 +25,43 @@ public class Measurement implements HostMetricBound {
/**
* The id of this table
*/
@SuppressWarnings("unused")
@Id
@GeneratedValue
private int id;
/**
* The simulation time for to this measurement in simulator time, that is, microseconds.
*/
*/
@SuppressWarnings("unused")
private long time;
/**
* The number of values for this measurement
*/
@SuppressWarnings("unused")
*/
@Column(name = "[count]")
private int count;
/**
* The sum of all values for this measurement
*/
@SuppressWarnings("unused")
@Column(nullable = true, name = "[sum]")
private Double sum;
/**
* The square sum of all values for this measurement
*/
@SuppressWarnings("unused")
@Column(nullable = true)
private Double sum2;
/**
* The minimum of all values for this measurement
*/
@SuppressWarnings("unused")
@Column(nullable = true, name = "[min]")
private Double min;
/**
* The maximum of all values for this measurement
*/
@SuppressWarnings("unused")
@Column(nullable = true, name = "[max]")
private Double max;
......
src/de/tud/kom/p2psim/impl/util/db/metric/MeasurementPair.java
View file @ 9bb579a4
package de.tud.kom.p2psim.impl.util.db.metric;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Index;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Index;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
......@@ -28,9 +29,8 @@ public class MeasurementPair {
/**
* A unique Id, will be set by the database
*/
@SuppressWarnings("unused")
@Id
@GeneratedValue()
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
/**
......@@ -45,7 +45,6 @@ public class MeasurementPair {
* It is called "the_key, because "key" is a (My?)SQL keyword and
* apparently hibernate is unable to escape it.
*/
@SuppressWarnings("unused")
@Column(nullable = false)
private int thekey;
......@@ -53,7 +52,6 @@ public class MeasurementPair {
/**
* The value for this measurement
*/
@SuppressWarnings("unused")
@Column(nullable = true)
private Double value;
......@@ -61,7 +59,6 @@ public class MeasurementPair {
* The mapping Object of this measurement to the {@link Metric}-Object,
* which describes this metric.
*/
@SuppressWarnings("unused")
@ManyToOne
@JoinColumn(name = "hostMetricId")
@OnDelete(action=OnDeleteAction.CASCADE)
......
src/de/tud/kom/p2psim/impl/util/db/metric/MeasurementPairList.java
View file @ 9bb579a4
package de.tud.kom.p2psim.impl.util.db.metric;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Index;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Index;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
......@@ -24,7 +25,7 @@ public class MeasurementPairList {
* A unique Id, will be set by the database
*/
@Id
@GeneratedValue()
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
/**
......
src/de/tud/kom/p2psim/impl/util/db/metric/MeasurementSingle.java
View file @ 9bb579a4
package de.tud.kom.p2psim.impl.util.db.metric;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Index;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Index;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
/** Statistical representation of a series of measurements in the database.
*
......@@ -29,9 +31,8 @@ public class MeasurementSingle {
/**
* A unique Id, will be set by the database
*/
@SuppressWarnings("unused")
@Id
@GeneratedValue()
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
/**
......@@ -43,7 +44,6 @@ public class MeasurementSingle {
/**
* The value for this measurement
*/
@SuppressWarnings("unused")
@Column(nullable = true)
private Double value;
......@@ -51,7 +51,6 @@ public class MeasurementSingle {
* The mapping Object of this measurement to the {@link Metric}-Object,
* which describes this metric.
*/
@SuppressWarnings("unused")
@ManyToOne
@JoinColumn(name = "hostMetricId")
private HostMetric hostMetric;
......
src/de/tud/kom/p2psim/impl/util/db/metric/MeasurementSpatial.java
View file @ 9bb579a4
......@@ -20,14 +20,16 @@
package de.tud.kom.p2psim.impl.util.db.metric;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Index;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Index;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
/**
* A single measurement, but with an assigned location.
......@@ -43,9 +45,8 @@ public class MeasurementSpatial {
/**
* A unique Id, will be set by the database
*/
@SuppressWarnings("unused")
@Id
@GeneratedValue()
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
/**
......@@ -57,7 +58,6 @@ public class MeasurementSpatial {
/**
* The value for this measurement
*/
@SuppressWarnings("unused")
@Column(nullable = true)
private Double value;
......@@ -71,7 +71,6 @@ public class MeasurementSpatial {
* The mapping Object of this measurement to the {@link Metric}-Object,
* which describes this metric.
*/
@SuppressWarnings("unused")
@ManyToOne
@JoinColumn(name = "hostMetricId")
private HostMetric hostMetric;
......
src/de/tud/kom/p2psim/impl/util/db/metric/MeasurementStatistic.java
View file @ 9bb579a4
......@@ -20,15 +20,17 @@
package de.tud.kom.p2psim.impl.util.db.metric;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Index;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Index;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
......@@ -48,7 +50,7 @@ public class MeasurementStatistic implements GroupMetricBound {
* The id of this table
*/
@Id
@GeneratedValue
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
/**
......
src/de/tud/kom/p2psim/impl/util/db/metric/MeasurementStatisticMsgType.java
View file @ 9bb579a4
......@@ -20,15 +20,16 @@
package de.tud.kom.p2psim.impl.util.db.metric;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Index;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Index;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
......@@ -48,7 +49,7 @@ public class MeasurementStatisticMsgType implements GroupMetricBound {
* The id of this table
*/
@Id
@GeneratedValue
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
/**
......
src/de/tud/kom/p2psim/impl/util/db/metric/Metric.java
View file @ 9bb579a4
package de.tud.kom.p2psim.impl.util.db.metric;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Index;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Index;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
/** Database representation of a metric.
*
......@@ -28,9 +29,9 @@ public class Metric {
/**
* The unique id for this table, which is created by the database
*/
@SuppressWarnings("unused")
//@SuppressWarnings("unused")
@Id
@GeneratedValue
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
/**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment