Skip to content

Commit a5a0fc7

Browse files
issue_896: Placed test task in the root build.gradle. Made more fixes to the test classes.
1 parent 3cbaa26 commit a5a0fc7

File tree

10 files changed

+182
-98
lines changed

10 files changed

+182
-98
lines changed

HIRS_AttestationCA/build.gradle

+1-5
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,4 @@ sourceSets {
7070
srcDir '../HIRS_Provisioner.NET/hirs/Resources'
7171
}
7272
}
73-
}
74-
75-
test {
76-
useJUnitPlatform()
77-
}
73+
}

HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/info/FirmwareInfo.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
public class FirmwareInfo implements Serializable {
2020

2121
@XmlElement
22-
@Column(length = DeviceInfoEnums.LONG_STRING_LENGTH, nullable = false)
22+
@Column(nullable = false)
2323
private final String biosVendor;
2424

2525
@XmlElement
26-
@Column(length = DeviceInfoEnums.LONG_STRING_LENGTH, nullable = false)
26+
@Column(nullable = false)
2727
private final String biosVersion;
2828

2929
@XmlElement

HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/info/OSInfo.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@
2121
public class OSInfo implements Serializable {
2222

2323
@XmlElement
24-
@Column(length = DeviceInfoEnums.LONG_STRING_LENGTH, nullable = false)
24+
@Column(nullable = false)
2525
private final String osName;
2626

2727
@XmlElement
28-
@Column(length = DeviceInfoEnums.LONG_STRING_LENGTH, nullable = false)
28+
@Column(nullable = false)
2929
private final String osVersion;
3030

3131
@XmlElement
3232
@Column(length = DeviceInfoEnums.SHORT_STRING_LENGTH, nullable = false)
3333
private final String osArch;
3434

3535
@XmlElement
36-
@Column(length = DeviceInfoEnums.SHORT_STRING_LENGTH, nullable = true)
36+
@Column(length = DeviceInfoEnums.SHORT_STRING_LENGTH)
3737
private final String distribution;
3838

3939
@XmlElement
40-
@Column(length = DeviceInfoEnums.SHORT_STRING_LENGTH, nullable = true)
40+
@Column(length = DeviceInfoEnums.SHORT_STRING_LENGTH)
4141
private final String distributionRelease;
4242

4343
/**

HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/info/TPMInfo.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@ public class TPMInfo implements Serializable {
3030
private static final int MAX_BLOB_SIZE = 65535;
3131

3232
@XmlElement
33-
@Column(length = DeviceInfoEnums.MED_STRING_LENGTH, nullable = true)
33+
@Column(length = DeviceInfoEnums.MED_STRING_LENGTH)
3434
private String tpmMake;
3535

3636
@XmlElement
37-
@Column(nullable = true)
37+
@Column
3838
private short tpmVersionMajor;
3939

4040
@XmlElement
41-
@Column(nullable = true)
41+
@Column
4242
private short tpmVersionMinor;
4343

4444
@XmlElement
45-
@Column(nullable = true)
45+
@Column
4646
private short tpmVersionRevMajor;
4747

4848
@XmlElement
49-
@Column(nullable = true)
49+
@Column
5050
private short tpmVersionRevMinor;
5151

5252
/**
@@ -60,13 +60,13 @@ public class TPMInfo implements Serializable {
6060
@JsonIgnore
6161
private X509Certificate identityCertificate;
6262

63-
@Column(nullable = true, columnDefinition = "blob")
63+
@Column(columnDefinition = "blob")
6464
private byte[] pcrValues;
6565

66-
@Column(nullable = true, columnDefinition = "blob")
66+
@Column(columnDefinition = "blob")
6767
private byte[] tpmQuoteHash;
6868

69-
@Column(nullable = true, columnDefinition = "blob")
69+
@Column(columnDefinition = "blob")
7070
private byte[] tpmQuoteSignature;
7171

7272
/**

0 commit comments

Comments
 (0)