Skip to content

Commit df79729

Browse files
alekszivkoalekszivko
authored
Revert "Cicd/13 add to GitHub actions coverage tests on pull request"
1 parent 90ddf51 commit df79729

40 files changed

+644
-243
lines changed

‎pom.xml

+6-41
Original file line numberDiff line numberDiff line change
@@ -5,45 +5,6 @@
55
<artifactId>sj2324-seed</artifactId>
66
<build>
77
<plugins>
8-
<plugin>
9-
<groupId>org.jacoco</groupId>
10-
<artifactId>jacoco-maven-plugin</artifactId>
11-
<version>0.8.12</version>
12-
<executions>
13-
<execution>
14-
<goals>
15-
<goal>prepare-agent</goal>
16-
</goals>
17-
</execution>
18-
<execution>
19-
<id>report</id>
20-
<phase>test</phase>
21-
<goals>
22-
<goal>report</goal>
23-
</goals>
24-
</execution>
25-
<execution>
26-
<id>jacoco-check</id>
27-
<goals>
28-
<goal>check</goal>
29-
</goals>
30-
<configuration>
31-
<rules>
32-
<rule>
33-
<element>PACKAGE</element>
34-
<limits>
35-
<limit>
36-
<counter>LINE</counter>
37-
<value>COVEREDRATIO</value>
38-
<minimum>0.0</minimum>
39-
</limit>
40-
</limits>
41-
</rule>
42-
</rules>
43-
</configuration>
44-
</execution>
45-
</executions>
46-
</plugin>
478
<plugin>
489
<artifactId>springdoc-openapi-maven-plugin</artifactId>
4910
<executions>
@@ -116,6 +77,10 @@
11677
<artifactId>spring-boot-starter-thymeleaf</artifactId>
11778
<groupId>org.springframework.boot</groupId>
11879
</dependency>
80+
<dependency>
81+
<artifactId>spring-boot-starter-thymeleaf</artifactId>
82+
<groupId>org.springframework.boot</groupId>
83+
</dependency>
11984
<dependency>
12085
<artifactId>spring-boot-starter-web</artifactId>
12186
<groupId>org.springframework.boot</groupId>
@@ -166,7 +131,7 @@
166131
<dependency>
167132
<artifactId>postgresql</artifactId>
168133
<groupId>org.testcontainers</groupId>
169-
<scope>runtime</scope>
134+
<scope>test</scope>
170135
</dependency>
171136
<dependency>
172137
<artifactId>spring-boot-devtools</artifactId>
@@ -187,7 +152,7 @@
187152
<artifactId>spring-boot-starter-parent</artifactId>
188153
<groupId>org.springframework.boot</groupId>
189154
<relativePath/>
190-
<version>3.2.4</version> <!-- lookup parent from repository -->
155+
<version>3.2.3</version> <!-- lookup parent from repository -->
191156
</parent>
192157
<properties>
193158
<java.version>22</java.version>

‎src/main/java/at/spengergasse/sj2324seedproject/domain/Address.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
// implemented by MM
1717
@Data
18-
@Builder
1918
@NoArgsConstructor
2019
@AllArgsConstructor
20+
@Builder
2121

2222

2323
@Embeddable

‎src/main/java/at/spengergasse/sj2324seedproject/domain/Customer.java

-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
package at.spengergasse.sj2324seedproject.domain;
22

33
import jakarta.persistence.Embeddable;
4-
import lombok.AllArgsConstructor;
54
import lombok.Builder;
6-
import lombok.NoArgsConstructor;
75

86
@Builder
9-
10-
117
@Embeddable
128
public record Customer(String connectionNo) {
139

‎src/main/java/at/spengergasse/sj2324seedproject/domain/Producer.java

+13-8
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,38 @@
66
import lombok.AllArgsConstructor;
77
import lombok.Builder;
88
import lombok.Data;
9-
import lombok.EqualsAndHashCode;
109
import lombok.NoArgsConstructor;
1110
import org.springframework.data.jpa.domain.AbstractPersistable;
1211

1312
import java.util.List;
1413

1514
@Data
16-
@Builder
1715
@NoArgsConstructor
1816
@AllArgsConstructor
19-
@EqualsAndHashCode(callSuper = true)
20-
21-
22-
@Entity
17+
@Builder
2318
@Table(name = "producers")
19+
@Entity
2420
public class Producer extends AbstractPersistable<Long>{
2521

22+
/*
23+
Relations
24+
*/
25+
2626
@OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.MERGE})
2727
private List<StorageObjectMeta> storageObjectMeta;
2828

29+
30+
/*
31+
Attributes
32+
*/
33+
2934
@Column(name = "shortname", length = ConstantsDomain.DEFAULT_LENGTH)
3035
@NotBlank
31-
private String shortname;
36+
private String shortname = ConstantsDomain.DEFAULT_VALUE;
3237

3338
@NotBlank
3439
@Column(name = "producer_name", length = ConstantsDomain.DEFAULT_LENGTH)
35-
private String name;
40+
private String name = ConstantsDomain.DEFAULT_VALUE;
3641

3742

3843

‎src/main/java/at/spengergasse/sj2324seedproject/domain/Profile.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@
1111

1212
@Data
1313
@Builder
14+
@Embeddable
1415
@NoArgsConstructor
1516
@AllArgsConstructor
16-
17-
18-
@Embeddable
1917
public class Profile {
2018

2119
private static final int USERNAME_LENGTH = 10;

‎src/main/java/at/spengergasse/sj2324seedproject/domain/Reservation.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,14 @@
1515
import lombok.AllArgsConstructor;
1616
import lombok.Builder;
1717
import lombok.Data;
18-
import lombok.EqualsAndHashCode;
1918
import lombok.NoArgsConstructor;
2019
import org.springframework.data.jpa.domain.AbstractPersistable;
2120

2221
@Data
22+
@Entity
2323
@Builder
2424
@NoArgsConstructor
2525
@AllArgsConstructor
26-
@EqualsAndHashCode(callSuper = true)
27-
28-
29-
@Entity
3026
@Table(name = "reservations")
3127
public class Reservation extends AbstractPersistable<Long> {
3228

‎src/main/java/at/spengergasse/sj2324seedproject/domain/Storage.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,14 @@
1010
import lombok.AllArgsConstructor;
1111
import lombok.Builder;
1212
import lombok.Data;
13-
import lombok.EqualsAndHashCode;
1413
import lombok.NoArgsConstructor;
1514
import org.springframework.data.jpa.domain.AbstractPersistable;
1615

1716
// Implementend by MM
1817
@Data
19-
@Builder
2018
@NoArgsConstructor
2119
@AllArgsConstructor
22-
@EqualsAndHashCode(callSuper = true)
20+
@Builder
2321

2422
@Entity
2523
@Table(name="storages")

‎src/main/java/at/spengergasse/sj2324seedproject/domain/StorageObject.java

+13-7
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,29 @@
66
import lombok.AllArgsConstructor;
77
import lombok.Builder;
88
import lombok.Data;
9-
import lombok.EqualsAndHashCode;
109
import lombok.NoArgsConstructor;
1110
import org.springframework.data.jpa.domain.AbstractPersistable;
1211

1312
import java.util.ArrayList;
1413
import java.util.List;
1514

1615
@Data
16+
@Entity
1717
@Builder
1818
@NoArgsConstructor
1919
@AllArgsConstructor
20-
@EqualsAndHashCode(callSuper = true)
21-
22-
23-
@Entity
2420
@Table(name = "storage_objects")
2521
public class StorageObject extends AbstractPersistable<Long>{
2622

23+
/*
24+
Relations
25+
*/
26+
27+
28+
// @JoinColumn(name = "fk_stored_at_user", foreignKey = @ForeignKey(name = "fk_storageObject_2_user"))
29+
// @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE, CascadeType.PERSIST})
2730
@OneToMany
28-
private List<User> storedAtUsers;
31+
private List<User> storedAtUser = new ArrayList<>();
2932

3033
@ManyToOne(fetch = FetchType.LAZY,
3134
cascade = {CascadeType.MERGE, CascadeType.PERSIST})
@@ -53,6 +56,9 @@ public class StorageObject extends AbstractPersistable<Long>{
5356
cascade = {CascadeType.MERGE, CascadeType.PERSIST})
5457
private Reservation reservation;
5558

59+
/*
60+
Attributes
61+
*/
5662
@Column(name = "serial_number")
5763
private String serialNumber;
5864

@@ -62,7 +68,7 @@ public class StorageObject extends AbstractPersistable<Long>{
6268

6369
@Column(name = "remark")
6470
@NotBlank
65-
private String remark;
71+
private String remark = ConstantsDomain.DEFAULT_VALUE;
6672

6773
@Column(name = "project_device")
6874
private Boolean projectDevice;

‎src/main/java/at/spengergasse/sj2324seedproject/domain/StorageObjectHistory.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,19 @@
77
import lombok.AllArgsConstructor;
88
import lombok.Builder;
99
import lombok.Data;
10-
import lombok.EqualsAndHashCode;
1110
import lombok.NoArgsConstructor;
1211
import org.springframework.data.jpa.domain.AbstractPersistable;
1312

1413
import java.time.LocalDateTime;
1514

1615
@Data
17-
@Builder
1816
@NoArgsConstructor
1917
@AllArgsConstructor
20-
@EqualsAndHashCode(callSuper = true)
21-
18+
@Builder
2219

2320
@Entity
2421
@Table(name ="storageObjectHistory")
22+
2523
public class StorageObjectHistory extends AbstractPersistable<Long> {
2624

2725
@ManyToOne(fetch = FetchType.LAZY)

‎src/main/java/at/spengergasse/sj2324seedproject/domain/StorageObjectMeta.java

+14-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import lombok.AllArgsConstructor;
99
import lombok.Builder;
1010
import lombok.Data;
11-
import lombok.EqualsAndHashCode;
1211
import lombok.NoArgsConstructor;
1312
import org.springframework.data.jpa.domain.AbstractPersistable;
1413

@@ -17,15 +16,18 @@
1716

1817

1918
@Data
20-
@Builder
2119
@NoArgsConstructor
2220
@AllArgsConstructor
23-
@EqualsAndHashCode(callSuper = true)
24-
21+
@Builder
2522
@Entity
2623
@Table(name = "storage_object_metas")
24+
2725
public class StorageObjectMeta extends AbstractPersistable<Long>{
2826

27+
/*
28+
Relations
29+
*/
30+
2931
@OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE, CascadeType.PERSIST})
3032
public List<StorageObject> storageobject;
3133

@@ -38,13 +40,17 @@ public class StorageObjectMeta extends AbstractPersistable<Long>{
3840
@Enumerated(EnumType.STRING)
3941
private Type type;
4042

43+
/*
44+
Attributes
45+
*/
46+
4147
@NotBlank
4248
@Column(name = "storage_object_name")
43-
private String name;
49+
private String name = ConstantsDomain.DEFAULT_VALUE;
4450

4551
@NotBlank
4652
@Column(name = "os_version")
47-
private String osVersion;
53+
private String osVersion = ConstantsDomain.DEFAULT_VALUE;
4854

4955
@Min(0)
5056
@Column(name = "consumables_per_box")
@@ -56,11 +62,11 @@ public class StorageObjectMeta extends AbstractPersistable<Long>{
5662

5763
@NotBlank
5864
@Column(name = "wave_length")
59-
private String wavelength;
65+
private String wavelength = ConstantsDomain.DEFAULT_VALUE;
6066

6167
@NotBlank
6268
@Column(name = "interface_speed")
63-
private String interfacespeed;
69+
private String interfacespeed = ConstantsDomain.DEFAULT_VALUE;
6470

6571

6672
}

‎src/main/java/at/spengergasse/sj2324seedproject/domain/Type.java

+15-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
import lombok.Getter;
55

66
@Getter
7-
@AllArgsConstructor
7+
//@NoArgsConstructor
8+
@AllArgsConstructor //Error wenn erzeugt -> java: Konstruktor Type() ist bereits in Enumeration at.spengergasse.sj23247abcif.domain.Type definiert
89
public enum Type{
910

1011
IP_PHONE("IP Phone", "IPP"),
@@ -13,6 +14,17 @@ public enum Type{
1314
SFP("Sfp", "Sfp"),
1415
CONSUMABLES("Consumables", "Cs");
1516

16-
final private String longVersion;
17-
final private String shortVersion;
17+
18+
19+
private String longVersion;
20+
private String shortVersion;
21+
22+
//public enum Type {
23+
//
24+
// IP_PHONE,
25+
// ROUTER,
26+
// SWITCH,
27+
// SFP,
28+
// CONSUMABLES
29+
//
1830
}

‎src/main/java/at/spengergasse/sj2324seedproject/domain/User.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,16 @@
1111
import lombok.AllArgsConstructor;
1212
import lombok.Builder;
1313
import lombok.Data;
14-
import lombok.EqualsAndHashCode;
1514
import lombok.NoArgsConstructor;
1615
import org.hibernate.validator.constraints.Length;
1716
import org.springframework.data.jpa.domain.AbstractPersistable;
1817
import org.springframework.format.annotation.DateTimeFormat;
1918

2019
@Data
20+
@Entity
2121
@Builder
2222
@NoArgsConstructor
2323
@AllArgsConstructor
24-
@EqualsAndHashCode(callSuper = true)
25-
26-
27-
@Entity
2824
@Table(name = "app_user")
2925
public class User extends AbstractPersistable<Long> {
3026

0 commit comments

Comments
 (0)