Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • branch-2.5
  • branch-2.7
  • feature/ISSUE-173_service_admin_index_xhtml_not_working
  • feature/ISSUE-182_implement-microprofile-health-checks
  • feature/ISSUE-186_add-publish-flag-to-projects-and-generate-a-list
  • feature/ISSUE-211_allow-for-account-linking-of-two-existing-accounts
  • feature/ISSUE-217_improve-layout
  • feature/ISSUE-225_make-e-mail-address-mandatory-2
  • feature/ISSUE-226_add-serviceoidcclient-to-invoke-method
  • feature/ISSUE-237_try-to-remove-dependencies-to-jms
  • feature/ISSUE-241_refactoring-of-services
  • feature/ISSUE-241_refactoring-of-services-2
  • feature/ISSUE-241_refactoring-of-services-3
  • feature/ISSUE-242_introduce-automated-code-formatting
  • feature/REGAPP-17_project_management
  • feature/maven-compiler-release
  • feature_orcid
  • main
  • 2.5.0
  • 2.5.1
  • 2.5.10
  • 2.5.11
  • 2.5.12
  • 2.5.13
  • 2.5.14
  • 2.5.2
  • 2.5.3
  • 2.5.4
  • 2.5.5
  • 2.5.6
  • 2.5.7
  • 2.5.8
  • 2.5.9
  • 2.7.1
  • 2.7.2
  • 2.7.3
  • 2.7.4
  • 2.7.5
  • 2.7.6
  • 2.7.7
  • 2.7.8
  • 2.8.0
  • 2.8.1
  • 2.8.2
44 results

Target

Select target project
  • kit/reg-app/regapp
  • uywls/regapp
  • janis.streib/regapp
3 results
Select Git revision
  • branch-2.5
  • branch-2.7
  • feature/ISSUE-173_service_admin_index_xhtml_not_working
  • feature/ISSUE-182_implement-microprofile-health-checks
  • feature/ISSUE-186_add-publish-flag-to-projects-and-generate-a-list
  • feature/ISSUE-211_allow-for-account-linking-of-two-existing-accounts
  • feature/ISSUE-217_improve-layout
  • feature/REGAPP-17_project_management
  • main
  • 2.5.0
  • 2.5.1
  • 2.5.10
  • 2.5.11
  • 2.5.12
  • 2.5.13
  • 2.5.14
  • 2.5.2
  • 2.5.3
  • 2.5.4
  • 2.5.5
  • 2.5.6
  • 2.5.7
  • 2.5.8
  • 2.5.9
  • 2.7.1
  • 2.7.2
  • 2.7.3
  • 2.7.4
  • 2.7.5
  • 2.7.6
  • 2.7.7
  • 2.7.8
  • 2.8.0
  • 2.8.1
34 results
Show changes
Commits on Source (853)
753 additional commits have been omitted to prevent performance issues.
Hide whitespace changes
Inline Side-by-side
Showing
with 473 additions and 442 deletions
.gitignore
View file @ 45c4b2d3
......@@ -4,3 +4,8 @@
.metadata
.vscode
target
.flattened-pom.xml
.factorypath
# Projekt-spezifisches Local-Maven-Repo (wegen gitlab)
/maven/repository/
.gitlab-ci-release.yml 0 → 100644
View file @ 45c4b2d3
image: maven:3-openjdk-17
variables:
GIT_STRATEGY: clone
GIT_AUTHOR_NAME: Release Bot
GIT_AUTHOR_EMAIL: regapp-support@lists.kit.edu
GIT_COMMITTER_NAME: Release Bot
GIT_COMMITTER_EMAIL: regapp-support@lists.kit.edu
stages:
- validate-version
- perform-test-build
- release
validate-version:
stage: validate-version
script: |
set +x
## Validating version string ...
[[ $RELEASE_VERSION =~ ^[0-9](\.[0-9]+){2}$ ]] || exit_code=$?
if [[ $exit_code -ne 0 ]]; then echo "Value $RELEASE_VERSION is not a valid version string"; exit 1; fi;
echo "Value $RELEASE_VERSION is a valid version string"
perform-test-build:
stage: perform-test-build
script: |
set +x
## Performing test build ...
mvn test
release:
stage: release
script: |
set +x
## Performing release ...
git checkout "$CI_COMMIT_REF_NAME"
echo "Release version $RELEASE_VERSION"
echo " Updating and committing pom.xml (version $RELEASE_VERSION)"
mvn versions:set-property -q -DgenerateBackupPoms=false -Dproperty=revision -DnewVersion=$RELEASE_VERSION
git add *
git commit -q -m "NO_STORY Update version to $RELEASE_VERSION"
git push -q "https://regapp_release_token:$RELEASE_ACCESS_TOKEN@git.scc.kit.edu/reg-app/reg-app.git"
echo " Tagging commit"
git tag -a $RELEASE_VERSION -m "NO_STORY Release version $RELEASE_VERSION"
git push -q "https://regapp_release_token:$RELEASE_ACCESS_TOKEN@git.scc.kit.edu/reg-app/reg-app.git" "$RELEASE_VERSION"
SNAPSHOT_VERSION=$(echo $RELEASE_VERSION | perl -pe 's/^(\d+)\.(\d+)\.(\d+)$/"$1.".($2+1).".0-SNAPSHOT"/e')
echo " Updating and committing pom.xml (version $SNAPSHOT_VERSION)"
mvn versions:set-property -q -DgenerateBackupPoms=false -Dproperty=revision -DnewVersion=$SNAPSHOT_VERSION
git add *
git commit -q -m "NO_STORY Update version to $SNAPSHOT_VERSION"
git push -q "https://regapp_release_token:$RELEASE_ACCESS_TOKEN@git.scc.kit.edu/reg-app/reg-app.git"
.gitlab-ci.yml
View file @ 45c4b2d3
image: maven:3-jdk-11
variables:
MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=maven/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version"
RELEASE_VERSION:
description: |
Non-Snapshot version of the release. If none ist given, a regular
non-release build is performed. Releases are only performed on the
main branch. Example value: 2.7.8
image: maven:3-openjdk-17
cache:
paths:
- .m2/
- bwreg-ear/target/
- key: $CI_JOB_NAME
paths:
- maven/repository
- paths:
- target
trigger-release-pipeline:
stage: build
rules:
- if: $RELEASE_VERSION != "" && $CI_COMMIT_BRANCH == "main"
trigger:
include: .gitlab-ci-release.yml
strategy: depend
forward:
pipeline_variables: true
build:
stage: build
tags:
- mvn-docker
rules:
- if: $RELEASE_VERSION == "" && $CI_COMMIT_TAG == null && $CI_PIPELINE_SOURCE != "schedule"
script:
mvn -s maven/settings.xml $MAVEN_CLI_OPTS -B clean install source:jar deploy
scan-for-vulnerabilities:
stage: build
tags:
- mvn-docker
script:
mvn -s maven/settings.xml -B package
- mvn -s maven/settings.xml $MAVEN_CLI_OPTS dependency-check:aggregate
artifacts:
paths:
- target/dependency-check-report.html
rules:
- if: $CI_PIPELINE_SOURCE == "schedule"
README.md
View file @ 45c4b2d3
......@@ -2,4 +2,4 @@
Passive identity management (IDM) application, developed first as part of the bwIdm project.
[User Guide](https://git.scc.kit.edu/simon/reg-app/wikis/home)
[User Guide](https://gitlab.kit.edu/kit/reg-app/regapp/-/wikis/home)
bwreg-ear/pom.xml
View file @ 45c4b2d3
......@@ -8,122 +8,233 @@
Contributors:
Michael Simon - initial
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>bwreg-ear</artifactId>
<packaging>ear</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<parent>
<groupId>edu.kit.scc</groupId>
<artifactId>bwreg</artifactId>
<version>2.7.6</version>
<version>${revision}</version>
</parent>
<dependencies>
<dependency>
<groupId>edu.kit.scc</groupId>
<artifactId>bwreg-entities</artifactId>
<version>2.7.6</version>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>edu.kit.scc</groupId>
<artifactId>bwreg-jpa</artifactId>
<version>2.7.6</version>
<type>ejb</type>
<artifactId>regapp-as</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>edu.kit.scc</groupId>
<artifactId>bwreg-service</artifactId>
<version>2.7.6</version>
<artifactId>regapp-audit</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-config</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-drools</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-ejb-service</artifactId>
<version>${project.version}</version>
<type>ejb</type>
</dependency>
<dependency>
<groupId>edu.kit.scc</groupId>
<artifactId>bwreg-webapp</artifactId>
<version>2.7.6</version>
<type>war</type>
<artifactId>regapp-event-api</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-saml-api</artifactId>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-exc</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-saml-impl</artifactId>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-idty</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-job-api</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-jpa-api</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-jpa-impl</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>edu.vt.middleware</groupId>
<artifactId>vt-ldap</artifactId>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-oidc</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.kie</groupId>
<artifactId>kie-api</artifactId>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-oidc-op</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-oidc-rp</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-compiler</artifactId>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-reg-api</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-reg-impl</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-reg-ldap</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-saml</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-saml-idp</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-saml-sp</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-session</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-tools</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-twofa</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>jcifs</groupId>
<artifactId>jcifs</artifactId>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-template</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-mail</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-sshkey</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<groupId>edu.kit.scc</groupId>
<artifactId>bwreg-lib</artifactId>
<version>${revision}</version>
<type>ejb</type>
</dependency>
<dependency>
<groupId>edu.kit.scc</groupId>
<artifactId>bwreg-jpa</artifactId>
<version>${project.version}</version>
<type>ejb</type>
</dependency>
<dependency>
<groupId>edu.kit.scc</groupId>
<artifactId>bwreg-service</artifactId>
<version>${project.version}</version>
<type>ejb</type>
</dependency>
<dependency>
<groupId>edu.kit.scc</groupId>
<artifactId>bwreg-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>ch.ethz.ganymed</groupId>
<artifactId>ganymed-ssh2</artifactId>
<groupId>org.openjdk.nashorn</groupId>
<artifactId>nashorn-core</artifactId>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>oauth2-oidc-sdk</artifactId>
<groupId>ch.ethz.ganymed</groupId>
<artifactId>ganymed-ssh2</artifactId>
</dependency>
<dependency>
<groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId>
<classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>org.primefaces.extensions</groupId>
<artifactId>primefaces-extensions</artifactId>
<classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
......@@ -135,19 +246,27 @@
</dependency>
<dependency>
<artifactId>dom4j</artifactId>
<groupId>dom4j</groupId>
<scope>provided</scope>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<groupId>edu.vt.middleware</groupId>
<artifactId>vt-ldap</artifactId>
<exclusions>
<exclusion>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- dom4j to override vt-ldap dom4j -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
</dependency>
</dependencies>
......@@ -158,7 +277,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<version>2.8</version>
<version>3.3.0</version>
<configuration>
<version>6</version>
<applicationName>bwreg</applicationName>
......@@ -182,16 +301,38 @@
<bundleFileName>bwreg-service.jar</bundleFileName>
<moduleId>bwreg-service</moduleId>
</ejbModule>
<ejbModule>
<groupId>edu.kit.scc</groupId>
<artifactId>bwreg-lib</artifactId>
<bundleFileName>bwreg-lib.jar</bundleFileName>
<moduleId>bwreg-lib</moduleId>
</ejbModule>
<ejbModule>
<groupId>edu.kit.scc</groupId>
<artifactId>regapp-ejb-service</artifactId>
<bundleFileName>regapp-ejb-service.jar</bundleFileName>
<moduleId>regapp-ejb-service</moduleId>
</ejbModule>
<webModule>
<groupId>edu.kit.scc</groupId>
<artifactId>bwreg-webapp</artifactId>
<bundleFileName>bwreg-webapp.war</bundleFileName>
<contextRoot>/</contextRoot>
<moduleId>bwreg-webapp</moduleId>
</webModule>
</modules>
</modules>
<defaultLibBundleDir>lib</defaultLibBundleDir>
<initializeInOrder>true</initializeInOrder>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Add-Opens>java.base/java.net</Add-Opens>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugin>
</plugins>
</build>
......
bwreg-ear/src/main/application/META-INF/jboss-deployment-structure.xml 0 → 100644
View file @ 45c4b2d3
<?xml version="1.0"?>
<jboss-deployment-structure
xmlns="urn:jboss:deployment-structure:1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<deployment>
<dependencies>
<module name="asm.asm" />
<module name="jdk.dynalink" />
<module name="sun.jdk" export="true">
<imports>
<include path="sun/misc/Unsafe" />
</imports>
</module>
</dependencies>
</deployment>
</jboss-deployment-structure>
\ No newline at end of file
bwreg-entities/.gitignore 0 → 100644
View file @ 45c4b2d3
/.apt_generated/
/.apt_generated_tests/
bwreg-entities/pom.xml
View file @ 45c4b2d3
......@@ -5,24 +5,16 @@
<parent>
<groupId>edu.kit.scc</groupId>
<artifactId>bwreg</artifactId>
<version>2.7.6</version>
<version>${revision}</version>
</parent>
<packaging>jar</packaging>
<artifactId>bwreg-entities</artifactId>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.wildfly.bom</groupId>
<artifactId>wildfly-javaee8-with-tools</artifactId>
<version>17.0.1.Final</version>
<type>pom</type>
<scope>import</scope>
<optional>false</optional>
</dependency>
</dependencies>
</dependencyManagement>
<!-- <dependencyManagement> <dependencies> <dependency>
<groupId>org.wildfly.bom</groupId>
<artifactId>wildfly-javaee8-with-tools</artifactId>
<version>17.0.1.Final</version>
<type>pom</type> <scope>import</scope> <optional>false</optional> </dependency>
</dependencies> </dependencyManagement> -->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
......@@ -30,8 +22,8 @@
<dependencies>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>
......@@ -40,23 +32,46 @@
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>xml-apis</artifactId>
<groupId>xml-apis</groupId>
</exclusion>
</exclusions>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
<version>4.5</version>
<executions>
<execution>
<id>process</id>
<goals>
<goal>process</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<processors>
<processor>
org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
</processors>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
<version>6.3.1.Final</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/AbstractBaseEntity.java
View file @ 45c4b2d3
......@@ -13,16 +13,21 @@ package edu.kit.scc.webreg.entity;
import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
import javax.persistence.PrePersist;
import javax.persistence.PreUpdate;
import jakarta.persistence.Column;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.MappedSuperclass;
import jakarta.persistence.PrePersist;
import jakarta.persistence.PreUpdate;
import jakarta.persistence.Version;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@MappedSuperclass
public abstract class AbstractBaseEntity implements BaseEntity<Long>, Serializable {
public abstract class AbstractBaseEntity implements BaseEntity, Serializable {
private static final long serialVersionUID = 1L;
......@@ -30,35 +35,32 @@ public abstract class AbstractBaseEntity implements BaseEntity<Long>, Serializab
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "id")
protected Long id;
@Column(name = "created_at")
protected Date createdAt;
@Column(name = "updated_at")
protected Date updatedAt;
@Column(name = "version")
protected Integer version;
@SuppressWarnings("unchecked")
@Column(name = "version", columnDefinition = "integer DEFAULT 0", nullable = false)
@Version
protected Integer version = 0;
public boolean equals(Object other) {
if (other == null) return false;
return this.getClass().equals(other.getClass()) &&
(getId() != null)
? getId().equals(((BaseEntity<Long>) other).getId())
: (other == this);
if (other == null)
return false;
return this.getClass().equals(other.getClass()) && (getId() != null)
? getId().equals(((BaseEntity) other).getId())
: (other == this);
}
public int hashCode() {
return (getId() != null)
? (getClass().hashCode() + getId().hashCode())
: super.hashCode();
return (getId() != null) ? (getClass().hashCode() + getId().hashCode()) : super.hashCode();
}
@PrePersist
public void prePersist() {
setVersion(Integer.valueOf(0));
Date d = new Date();
setCreatedAt(d);
setUpdatedAt(d);
......@@ -66,42 +68,6 @@ public abstract class AbstractBaseEntity implements BaseEntity<Long>, Serializab
@PreUpdate
public void preUpdate() {
if (getVersion() == null)
setVersion(Integer.valueOf(0));
setVersion(getVersion() + 1);
setUpdatedAt(new Date());
}
public Date getCreatedAt() {
return createdAt;
}
public void setCreatedAt(Date createdAt) {
this.createdAt = createdAt;
}
public Date getUpdatedAt() {
return updatedAt;
}
public void setUpdatedAt(Date updatedAt) {
this.updatedAt = updatedAt;
}
public Integer getVersion() {
return version;
}
public void setVersion(Integer version) {
this.version = version;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
}
bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/AbstractBaseEntity_.java deleted 100644 → 0
View file @ 1be168f1
package edu.kit.scc.webreg.entity;
import java.util.Date;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
@StaticMetamodel(AbstractBaseEntity.class)
public abstract class AbstractBaseEntity_ {
public static volatile SingularAttribute<AbstractBaseEntity, Date> createdAt;
public static volatile SingularAttribute<AbstractBaseEntity, Long> id;
public static volatile SingularAttribute<AbstractBaseEntity, Integer> version;
public static volatile SingularAttribute<AbstractBaseEntity, Date> updatedAt;
}
bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/AdminRoleEntity.java
View file @ 45c4b2d3
......@@ -12,34 +12,21 @@ package edu.kit.scc.webreg.entity;
import java.util.Set;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import jakarta.persistence.Entity;
import jakarta.persistence.OneToMany;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@Entity(name = "AdminRoleEntity")
public class AdminRoleEntity extends RoleEntity {
private static final long serialVersionUID = 1L;
@OneToMany(targetEntity=ServiceEntity.class, mappedBy="adminRole")
@OneToMany(targetEntity = ServiceEntity.class, mappedBy = "adminRole")
private Set<ServiceEntity> adminForServices;
@OneToMany(targetEntity=ServiceEntity.class, mappedBy="hotlineRole")
@OneToMany(targetEntity = ServiceEntity.class, mappedBy = "hotlineRole")
private Set<ServiceEntity> hotlineForServices;
public Set<ServiceEntity> getAdminForServices() {
return adminForServices;
}
public void setAdminForServices(Set<ServiceEntity> adminForServices) {
this.adminForServices = adminForServices;
}
public Set<ServiceEntity> getHotlineForServices() {
return hotlineForServices;
}
public void setHotlineForServices(Set<ServiceEntity> hotlineForServices) {
this.hotlineForServices = hotlineForServices;
}
}
bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/AdminRoleEntity_.java deleted 100644 → 0
View file @ 1be168f1
package edu.kit.scc.webreg.entity;
import javax.annotation.Generated;
import javax.persistence.metamodel.SetAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
@StaticMetamodel(AdminRoleEntity.class)
public abstract class AdminRoleEntity_ extends edu.kit.scc.webreg.entity.RoleEntity_ {
public static volatile SetAttribute<AdminRoleEntity, ServiceEntity> adminForServices;
public static volatile SetAttribute<AdminRoleEntity, ServiceEntity> hotlineForServices;
}
bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/AdminUserEntity.java
View file @ 45c4b2d3
......@@ -12,66 +12,36 @@ package edu.kit.scc.webreg.entity;
import java.util.Set;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.Table;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.JoinTable;
import jakarta.persistence.ManyToMany;
import jakarta.persistence.Table;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@Entity(name = "AdminUserEntity")
@Table(name = "adminusertable")
public class AdminUserEntity extends AbstractBaseEntity {
private static final long serialVersionUID = 1L;
@Column(name = "username", length = 256, unique = true, nullable = false)
private String username;
@Column(name = "password", length = 256, nullable = false)
@Getter
@Setter
private String password;
@Column(name = "description", length = 512)
private String description;
@ManyToMany(targetEntity=RoleEntity.class, cascade = CascadeType.ALL)
@JoinTable(name = "adminuser_role",
joinColumns = @JoinColumn(name="admin_user_id"),
inverseJoinColumns = @JoinColumn(name="role_id")
)
private Set<RoleEntity> roles;
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public Set<RoleEntity> getRoles() {
return roles;
}
public void setRoles(Set<RoleEntity> roles) {
this.roles = roles;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
@ManyToMany(targetEntity = RoleEntity.class, cascade = CascadeType.ALL)
@JoinTable(name = "adminuser_role", joinColumns = @JoinColumn(name = "admin_user_id"), inverseJoinColumns = @JoinColumn(name = "role_id"))
private Set<RoleEntity> roles;
}
bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/AdminUserEntity_.java deleted 100644 → 0
View file @ 1be168f1
package edu.kit.scc.webreg.entity;
import javax.annotation.Generated;
import javax.persistence.metamodel.SetAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
@StaticMetamodel(AdminUserEntity.class)
public abstract class AdminUserEntity_ extends edu.kit.scc.webreg.entity.AbstractBaseEntity_ {
public static volatile SingularAttribute<AdminUserEntity, String> password;
public static volatile SetAttribute<AdminUserEntity, RoleEntity> roles;
public static volatile SingularAttribute<AdminUserEntity, String> description;
public static volatile SingularAttribute<AdminUserEntity, String> username;
}
bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/AgreementTextEntity.java
View file @ 45c4b2d3
......@@ -10,52 +10,47 @@
******************************************************************************/
package edu.kit.scc.webreg.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import org.hibernate.annotations.Type;
import java.sql.Types;
import java.util.Map;
import org.hibernate.annotations.JdbcTypeCode;
import jakarta.persistence.Column;
import jakarta.persistence.ElementCollection;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.JoinTable;
import jakarta.persistence.Lob;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.MapKeyColumn;
import jakarta.persistence.Table;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@Entity(name = "AgreementTextEntity")
@Table(name = "agreement_text")
public class AgreementTextEntity extends AbstractBaseEntity {
private static final long serialVersionUID = 1L;
@Column(name = "agreement")
@Lob
@Type(type = "org.hibernate.type.TextType")
@JdbcTypeCode(Types.LONGVARCHAR)
private String agreement;
@ElementCollection(fetch = FetchType.EAGER)
@JoinTable(name = "agreement_text_i18")
@MapKeyColumn(name = "key_data", length = 128)
@Column(name = "value_data")
@Lob
@JdbcTypeCode(Types.LONGVARCHAR)
private Map<String, String> agreementMap;
@Column(name = "name", length = 128)
private String name;
@ManyToOne(targetEntity = PolicyEntity.class)
private PolicyEntity policy;
public String getAgreement() {
return agreement;
}
public void setAgreement(String agreement) {
this.agreement = agreement;
}
public PolicyEntity getPolicy() {
return policy;
}
public void setPolicy(PolicyEntity policy) {
this.policy = policy;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}
bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/AgreementTextEntity_.java deleted 100644 → 0
View file @ 1be168f1
package edu.kit.scc.webreg.entity;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
@StaticMetamodel(AgreementTextEntity.class)
public abstract class AgreementTextEntity_ extends edu.kit.scc.webreg.entity.AbstractBaseEntity_ {
public static volatile SingularAttribute<AgreementTextEntity, String> agreement;
public static volatile SingularAttribute<AgreementTextEntity, String> name;
public static volatile SingularAttribute<AgreementTextEntity, PolicyEntity> policy;
}
bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/ApplicationConfigEntity.java
View file @ 45c4b2d3
......@@ -3,14 +3,18 @@ package edu.kit.scc.webreg.entity;
import java.util.Date;
import java.util.Map;
import javax.persistence.Column;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinTable;
import javax.persistence.MapKeyColumn;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.ElementCollection;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.JoinTable;
import jakarta.persistence.MapKeyColumn;
import jakarta.persistence.Table;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@Entity(name = "ApplicationConfigEntity")
@Table(name = "application_config")
public class ApplicationConfigEntity extends AbstractBaseEntity {
......@@ -19,10 +23,10 @@ public class ApplicationConfigEntity extends AbstractBaseEntity {
@Column(name = "format_version", length = 128)
private String configFormatVersion;
@Column(name = "sub_version", length = 128)
private String subVersion;
@Column(name = "activeConfig")
private Boolean activeConfig;
......@@ -31,48 +35,7 @@ public class ApplicationConfigEntity extends AbstractBaseEntity {
@ElementCollection(fetch = FetchType.EAGER)
@JoinTable(name = "application_config_options")
@MapKeyColumn(name = "key_data", length = 128)
@Column(name = "value_data", length = 2048)
private Map<String, String> configOptions;
public String getSubVersion() {
return subVersion;
}
public void setSubVersion(String subVersion) {
this.subVersion = subVersion;
}
public Boolean getActiveConfig() {
return activeConfig;
}
public void setActiveConfig(Boolean activeConfig) {
this.activeConfig = activeConfig;
}
public Map<String, String> getConfigOptions() {
return configOptions;
}
public void setConfigOptions(Map<String, String> configOptions) {
this.configOptions = configOptions;
}
public String getConfigFormatVersion() {
return configFormatVersion;
}
public void setConfigFormatVersion(String configFormatVersion) {
this.configFormatVersion = configFormatVersion;
}
public Date getDirtyStamp() {
return dirtyStamp;
}
public void setDirtyStamp(Date dirtyStamp) {
this.dirtyStamp = dirtyStamp;
}
@MapKeyColumn(name = "key_data", length = 128)
@Column(name = "value_data", length = 2048)
private Map<String, String> configOptions;
}
bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/ApplicationConfigEntity_.java deleted 100644 → 0
View file @ 1be168f1
package edu.kit.scc.webreg.entity;
import java.util.Date;
import javax.annotation.Generated;
import javax.persistence.metamodel.MapAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
@StaticMetamodel(ApplicationConfigEntity.class)
public abstract class ApplicationConfigEntity_ extends edu.kit.scc.webreg.entity.AbstractBaseEntity_ {
public static volatile SingularAttribute<ApplicationConfigEntity, Boolean> activeConfig;
public static volatile SingularAttribute<ApplicationConfigEntity, String> configFormatVersion;
public static volatile SingularAttribute<ApplicationConfigEntity, String> subVersion;
public static volatile SingularAttribute<ApplicationConfigEntity, Date> dirtyStamp;
public static volatile MapAttribute<ApplicationConfigEntity, String, String> configOptions;
}
bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/ApproverRoleEntity.java
View file @ 45c4b2d3
......@@ -12,11 +12,15 @@ package edu.kit.scc.webreg.entity;
import java.util.Set;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import javax.validation.constraints.NotNull;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.OneToMany;
import jakarta.validation.constraints.NotNull;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@Entity(name = "ApproverRoleEntity")
public class ApproverRoleEntity extends RoleEntity {
......@@ -26,22 +30,6 @@ public class ApproverRoleEntity extends RoleEntity {
private Set<ServiceEntity> approverForServices;
@NotNull
@Column(name="approval_bean", length=255)
@Column(name = "approval_bean", length = 255)
private String approvalBean;
public Set<ServiceEntity> getApproverForServices() {
return approverForServices;
}
public void setApproverForServices(Set<ServiceEntity> approverForServices) {
this.approverForServices = approverForServices;
}
public String getApprovalBean() {
return approvalBean;
}
public void setApprovalBean(String approvalBean) {
this.approvalBean = approvalBean;
}
}
bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/ApproverRoleEntity_.java deleted 100644 → 0
View file @ 1be168f1
package edu.kit.scc.webreg.entity;
import javax.annotation.Generated;
import javax.persistence.metamodel.SetAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
@StaticMetamodel(ApproverRoleEntity.class)
public abstract class ApproverRoleEntity_ extends edu.kit.scc.webreg.entity.RoleEntity_ {
public static volatile SingularAttribute<ApproverRoleEntity, String> approvalBean;
public static volatile SetAttribute<ApproverRoleEntity, ServiceEntity> approverForServices;
}

Help | Imprint | Privacy policy | Accessibility | Contact