.gitignore

@@ -5,3 +5,7 @@
 .vscode
 target
 .flattened-pom.xml
+.factorypath
+
+# Projekt-spezifisches Local-Maven-Repo (wegen gitlab)
+/maven/repository/

.gitlab-ci.yml

 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 
@@ -6,6 +8,13 @@ variables:
       main branch. Example value: 2.7.8
 
 image: maven:3-openjdk-17
+
+cache:
+  - key: $CI_JOB_NAME
+    paths:
+      - maven/repository
+  - paths:
+      - target
   
 trigger-release-pipeline:
   stage: build
@@ -22,7 +31,18 @@ build:
   tags:
     - mvn-docker
   rules:
-    - if: $RELEASE_VERSION == "" && $CI_COMMIT_TAG == null
+    - 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 -Dmaven.repo.local=/cache/.m2/repository -B clean install source:jar deploy
-    
+    - 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

@@ -2,4 +2,4 @@
 
 Passive identity management (IDM) application, developed first as part of the bwIdm project.
 
-[User Guide](https://git.scc.kit.edu/reg-app/reg-app/wikis/home)
+[User Guide](https://gitlab.kit.edu/kit/reg-app/regapp/-/wikis/home)

bwreg-ear/pom.xml

@@ -250,6 +250,24 @@
 			<artifactId>guava</artifactId>
 		</dependency>
 
+		<dependency>
+			<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>org.dom4j</groupId>
+			<artifactId>dom4j</artifactId>
+		</dependency>	
+		
+		
+
 	</dependencies>
 
 	<build>

bwreg-entities/.gitignore

+/.apt_generated/
+/.apt_generated_tests/

bwreg-entities/pom.xml

@@ -9,8 +9,10 @@
 	</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> 
+	<!-- <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>
@@ -35,6 +37,10 @@
 			<artifactId>hibernate-core</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -51,7 +57,8 @@
 						<phase>generate-sources</phase>
 						<configuration>
 							<processors>
-								<processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+								<processor>
+									org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
 							</processors>
 						</configuration>
 					</execution>

bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/AbstractBaseEntity.java

@@ -21,7 +21,11 @@ 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, Serializable {
 
@@ -31,30 +35,28 @@ public abstract class AbstractBaseEntity implements BaseEntity, Serializable {
 	@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", 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) 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
@@ -68,36 +70,4 @@ public abstract class AbstractBaseEntity implements BaseEntity, Serializable {
 	public void preUpdate() {
 		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/AdminRoleEntity.java

@@ -14,32 +14,19 @@ import java.util.Set;
 
 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/AdminUserEntity.java

@@ -19,59 +19,29 @@ 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/AgreementTextEntity.java

@@ -24,61 +24,33 @@ 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
 	@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
+	@MapKeyColumn(name = "key_data", length = 128)
+	@Column(name = "value_data")
+	@Lob
 	@JdbcTypeCode(Types.LONGVARCHAR)
-    private Map<String, String> agreementMap;
-	
+	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;
-	}
-
-	public Map<String, String> getAgreementMap() {
-		return agreementMap;
-	}
-
-	public void setAgreementMap(Map<String, String> agreementMap) {
-		this.agreementMap = agreementMap;
-	}
 }

bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/ApplicationConfigEntity.java

@@ -10,7 +10,11 @@ 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/ApproverRoleEntity.java

@@ -16,7 +16,11 @@ 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/BusinessRuleEntity.java

@@ -19,7 +19,11 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.Lob;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 @Entity(name = "BusinessRuleEntity")
 @Table(name = "business_rule")
 public class BusinessRuleEntity extends AbstractBaseEntity {
@@ -28,58 +32,18 @@ public class BusinessRuleEntity extends AbstractBaseEntity {
 
 	@Column(name = "rule_text")
 	@Lob
-	@JdbcTypeCode(Types.LONGVARCHAR)	
+	@JdbcTypeCode(Types.LONGVARCHAR)
 	private String rule;
-	
+
 	@Column(name = "rule_type", length = 32)
 	private String ruleType;
-	
+
 	@Column(name = "name", length = 128)
 	private String name;
-	
+
 	@Column(name = "base_name", length = 128)
 	private String knowledgeBaseName;
 
 	@ManyToOne(targetEntity = BusinessRulePackageEntity.class)
 	private BusinessRulePackageEntity rulePackage;
-	
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getRule() {
-		return rule;
-	}
-
-	public void setRule(String rule) {
-		this.rule = rule;
-	}
-
-	public String getRuleType() {
-		return ruleType;
-	}
-
-	public void setRuleType(String ruleType) {
-		this.ruleType = ruleType;
-	}
-
-	public String getKnowledgeBaseName() {
-		return knowledgeBaseName;
-	}
-
-	public void setKnowledgeBaseName(String knowledgeBaseName) {
-		this.knowledgeBaseName = knowledgeBaseName;
-	}
-
-	public BusinessRulePackageEntity getRulePackage() {
-		return rulePackage;
-	}
-
-	public void setRulePackage(BusinessRulePackageEntity rulePackage) {
-		this.rulePackage = rulePackage;
-	}
 }

bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/BusinessRulePackageEntity.java

@@ -18,7 +18,11 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 @Entity(name = "BusinessRulePackageEntity")
 @Table(name = "business_rule_package")
 public class BusinessRulePackageEntity extends AbstractBaseEntity {
@@ -38,48 +42,7 @@ public class BusinessRulePackageEntity extends AbstractBaseEntity {
 
 	@OneToMany(mappedBy = "rulePackage", targetEntity = BusinessRuleEntity.class)
 	private Set<BusinessRuleEntity> rules;
-	
+
 	@Column(name = "dirty_stamp")
 	private Date dirtyStamp;
-
-	public String getKnowledgeBaseName() {
-		return knowledgeBaseName;
-	}
-
-	public void setKnowledgeBaseName(String knowledgeBaseName) {
-		this.knowledgeBaseName = knowledgeBaseName;
-	}
-
-	public String getKnowledgeBaseVersion() {
-		return knowledgeBaseVersion;
-	}
-
-	public void setKnowledgeBaseVersion(String knowledgeBaseVersion) {
-		this.knowledgeBaseVersion = knowledgeBaseVersion;
-	}
-
-	public Set<BusinessRuleEntity> getRules() {
-		return rules;
-	}
-
-	public void setRules(Set<BusinessRuleEntity> rules) {
-		this.rules = rules;
-	}
-
-	public String getPackageName() {
-		return packageName;
-	}
-
-	public void setPackageName(String packageName) {
-		this.packageName = packageName;
-	}
-
-	public Date getDirtyStamp() {
-		return dirtyStamp;
-	}
-
-	public void setDirtyStamp(Date dirtyStamp) {
-		this.dirtyStamp = dirtyStamp;
-	}
-
 }

bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/ClusterMemberEntity.java

@@ -7,7 +7,11 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 @Entity(name = "ClusterMemberEntity")
 @Table(name = "cluster_member")
 public class ClusterMemberEntity extends AbstractBaseEntity {
@@ -19,65 +23,16 @@ public class ClusterMemberEntity extends AbstractBaseEntity {
 
 	@Enumerated(EnumType.STRING)
 	private ClusterMemberStatus clusterMemberStatus;
-	
+
 	@Column(name = "last_status_change")
 	private Date lastStatusChange;
-	
+
 	@Column(name = "last_status_check")
 	private Date lastStatusCheck;
-	
+
 	@Enumerated(EnumType.STRING)
 	private ClusterSchedulerStatus clusterSchedulerStatus;
-	
+
 	@Column(name = "last_scheduler_status_change")
 	private Date lastSchedulerStatusChange;
-	
-	public String getNodeName() {
-		return nodeName;
-	}
-
-	public void setNodeName(String nodeName) {
-		this.nodeName = nodeName;
-	}
-
-	public ClusterMemberStatus getClusterMemberStatus() {
-		return clusterMemberStatus;
-	}
-
-	public void setClusterMemberStatus(ClusterMemberStatus clusterMemberStatus) {
-		this.clusterMemberStatus = clusterMemberStatus;
-	}
-
-	public ClusterSchedulerStatus getClusterSchedulerStatus() {
-		return clusterSchedulerStatus;
-	}
-
-	public void setClusterSchedulerStatus(ClusterSchedulerStatus clusterSchedulerStatus) {
-		this.clusterSchedulerStatus = clusterSchedulerStatus;
-	}
-
-	public Date getLastSchedulerStatusChange() {
-		return lastSchedulerStatusChange;
-	}
-
-	public void setLastSchedulerStatusChange(Date lastSchedulerStatusChange) {
-		this.lastSchedulerStatusChange = lastSchedulerStatusChange;
-	}
-
-	public Date getLastStatusChange() {
-		return lastStatusChange;
-	}
-
-	public void setLastStatusChange(Date lastStatusChange) {
-		this.lastStatusChange = lastStatusChange;
-	}
-
-	public Date getLastStatusCheck() {
-		return lastStatusCheck;
-	}
-
-	public void setLastStatusCheck(Date lastStatusCheck) {
-		this.lastStatusCheck = lastStatusCheck;
-	}
-	
 }

bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/ClusterMemberStatus.java

@@ -12,7 +12,5 @@ package edu.kit.scc.webreg.entity;
 
 public enum ClusterMemberStatus {
 
-	ONLINE,
-	OFFLINE,
-	DEAD
+	ONLINE, OFFLINE, DEAD
 }

bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/ClusterSchedulerStatus.java

@@ -12,7 +12,6 @@ package edu.kit.scc.webreg.entity;
 
 public enum ClusterSchedulerStatus {
 
-	MASTER,
-	PASSIVE
-	
+	MASTER, PASSIVE
+
 }

bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/EmailTemplateEntity.java

@@ -20,7 +20,11 @@ import jakarta.persistence.Inheritance;
 import jakarta.persistence.InheritanceType;
 import jakarta.persistence.Lob;
 import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 @Entity(name = "EmailTemplateEntity")
 @Table(name = "email_template")
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
@@ -28,105 +32,32 @@ public class EmailTemplateEntity extends AbstractBaseEntity {
 
 	private static final long serialVersionUID = 1L;
 
-	@Column(name = "tpl_name", length=256)
+	@Column(name = "tpl_name", length = 256)
 	private String name;
-	
-	@Column(name = "tpl_subject", length=512)
+
+	@Column(name = "tpl_subject", length = 512)
 	private String subject;
-	
+
 	@Column(name = "tpl_body")
-	@Lob 
-	@JdbcTypeCode(Types.LONGVARCHAR)	
+	@Lob
+	@JdbcTypeCode(Types.LONGVARCHAR)
 	private String body;
-	
-	@Column(name = "tpl_to", length=512)
+
+	@Column(name = "tpl_to", length = 512)
 	private String to;
-	
-	@Column(name = "tpl_from", length=512)
+
+	@Column(name = "tpl_from", length = 512)
 	private String from;
-	
-	@Column(name = "tpl_cc", length=512)
+
+	@Column(name = "tpl_cc", length = 512)
 	private String cc;
 
-	@Column(name = "tpl_bcc", length=512)
+	@Column(name = "tpl_bcc", length = 512)
 	private String bcc;
-	
-	@Column(name = "tpl_reply_to", length=512)
+
+	@Column(name = "tpl_reply_to", length = 512)
 	private String replyTo;
 
-	@Column(name = "signature_alias", length=512)
+	@Column(name = "signature_alias", length = 512)
 	private String signatureAlias;
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getBody() {
-		return body;
-	}
-
-	public void setBody(String body) {
-		this.body = body;
-	}
-
-	public String getSubject() {
-		return subject;
-	}
-
-	public void setSubject(String subject) {
-		this.subject = subject;
-	}
-
-	public String getTo() {
-		return to;
-	}
-
-	public void setTo(String to) {
-		this.to = to;
-	}
-
-	public String getFrom() {
-		return from;
-	}
-
-	public void setFrom(String from) {
-		this.from = from;
-	}
-
-	public String getCc() {
-		return cc;
-	}
-
-	public void setCc(String cc) {
-		this.cc = cc;
-	}
-
-	public String getBcc() {
-		return bcc;
-	}
-
-	public void setBcc(String bcc) {
-		this.bcc = bcc;
-	}
-
-	public String getReplyTo() {
-		return replyTo;
-	}
-
-	public void setReplyTo(String replyTo) {
-		this.replyTo = replyTo;
-	}
-
-	public String getSignatureAlias() {
-		return signatureAlias;
-	}
-
-	public void setSignatureAlias(String signatureAlias) {
-		this.signatureAlias = signatureAlias;
-	}
-
 }

bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/EventEntity.java

@@ -17,7 +17,11 @@ import jakarta.persistence.Inheritance;
 import jakarta.persistence.InheritanceType;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 @Entity(name = "EventEntity")
 @Table(name = "event_table")
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
@@ -27,23 +31,7 @@ public class EventEntity extends AbstractBaseEntity {
 
 	@ManyToOne(targetEntity = JobClassEntity.class)
 	private JobClassEntity jobClass;
-	
+
 	@Enumerated(EnumType.STRING)
 	private EventType eventType;
-
-	public JobClassEntity getJobClass() {
-		return jobClass;
-	}
-
-	public void setJobClass(JobClassEntity jobClass) {
-		this.jobClass = jobClass;
-	}
-
-	public EventType getEventType() {
-		return eventType;
-	}
-
-	public void setEventType(EventType eventType) {
-		this.eventType = eventType;
-	}
 }

bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/EventType.java

@@ -15,73 +15,43 @@ public enum EventType {
 	/*
 	 * User Events
 	 */
-	USER_CREATE,
-	USER_UPDATE,
+	USER_CREATE, USER_UPDATE,
 
 	/*
 	 * Service Events
 	 */
-	SERVICE_REGISTER,
-	REGISTRY_UPDATE,
-	REGISTRY_PASSWORD_CHANGE,
-	SERVICE_DEREGISTER,
-	SERVICE_DEREGISTER_DELETE_ALL,
-	USER_LOST_ACCESS,
-	USER_GAINED_ACCESS,
-	APPROVAL_START,
-	APPROVAL_DENIED,
-	
-	
+	SERVICE_REGISTER, REGISTRY_UPDATE, REGISTRY_PASSWORD_CHANGE, SERVICE_DEREGISTER, SERVICE_DEREGISTER_DELETE_ALL,
+	USER_LOST_ACCESS, USER_GAINED_ACCESS, APPROVAL_START, APPROVAL_DENIED,
+
 	/*
 	 * Group Events
 	 */
 	GROUP_UPDATE,
-	
+
 	/*
 	 * SSH Key Events
 	 */
-	SSH_KEY_DEPLOYED,
-	SSH_KEY_DELETED,
-	SSH_KEY_EXPIRED,
-	SSH_KEY_REGISTRY_APPROVAL,
-	SSH_KEY_REGISTRY_DEPLOYED,
-	SSH_KEY_REGISTRY_DENIED,
-	SSH_KEY_REGISTRY_DELETED,
-	SSH_KEY_EXPIRY_WARNING,
-	
+	SSH_KEY_DEPLOYED, SSH_KEY_DELETED, SSH_KEY_EXPIRED, SSH_KEY_REGISTRY_APPROVAL, SSH_KEY_REGISTRY_DEPLOYED,
+	SSH_KEY_REGISTRY_DENIED, SSH_KEY_REGISTRY_DELETED, SSH_KEY_EXPIRY_WARNING,
+
 	/*
 	 * 2FA Events
 	 */
-	TWOFA_CREATED,
-	TWOFA_INIT,
-	TWOFA_ENABLED,
-	TWOFA_DISABLED,
-	TWOFA_DELETED,
-	TWOFA_RESET_FAILCOUNTER,
-	
+	TWOFA_CREATED, TWOFA_INIT, TWOFA_ENABLED, TWOFA_DISABLED, TWOFA_DELETED, TWOFA_RESET_FAILCOUNTER,
+
 	/*
 	 * Project Events
 	 */
-	PROJECT_CRREATED,
-	PROJECT_SERVICE_CREATED,
-	PROJECT_SERVICE_APPROVAL,
-	PROJECT_SERVICE_APPROVED,
-	PROJECT_SERVICE_DENIED,
-	PROJECT_SERVICE_DELETED,
-	
-	PROJECT_INVITATION_EMAIL_CREATED,
-	PROJECT_INVITATION_EMAIL_ACCEPTED,
-	PROJECT_INVITATION_EMAIL_DECLINED,
-	
-	PROJECT_MEMBER_ADD,
-	PROJECT_MEMBER_REMOVED,
-	
+	PROJECT_CRREATED, PROJECT_SERVICE_CREATED, PROJECT_SERVICE_APPROVAL, PROJECT_SERVICE_APPROVED,
+	PROJECT_SERVICE_DENIED, PROJECT_SERVICE_DELETED,
+
+	PROJECT_INVITATION_EMAIL_CREATED, PROJECT_INVITATION_EMAIL_ACCEPTED, PROJECT_INVITATION_EMAIL_DECLINED,
+
+	PROJECT_MEMBER_ADD, PROJECT_MEMBER_APPLY, PROJECT_MEMBER_REMOVED, PROJECT_STATUS,
+
 	/*
 	 * Email Address events
 	 */
-	EMAIL_ADDRESS_ADDED,
-	EMAIL_ADDRESS_REDO_VERIFICATION,
-	EMAIL_ADDRESS_VERIFIED,
-	EMAIL_ADDRESS_VERIFICATION_EXPIRED,
-	
+	EMAIL_ADDRESS_ADDED, EMAIL_ADDRESS_REDO_VERIFICATION, EMAIL_ADDRESS_VERIFIED, EMAIL_ADDRESS_VERIFICATION_EXPIRED,
+
 }