Skip to content

Commit c30373e

Browse files
yuzawa-sanyuzawa-san
committed
optimize fl,mt,or,tx
1 parent 8afa986 commit c30373e

File tree

15 files changed

+143
-141
lines changed

15 files changed

+143
-141
lines changed

‎iabgpp-encoder/src/main/java/com/iab/gpp/encoder/field/UsFlField.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55

66
public class UsFlField {
77

8-
public static String VERSION = "Version";
9-
public static String PROCESSING_NOTICE = "ProcessingNotice";
10-
public static String SALE_OPT_OUT_NOTICE = "SaleOptOutNotice";
11-
public static String TARGETED_ADVERTISING_OPT_OUT_NOTICE = "TargetedAdvertisingOptOutNotice";
12-
public static String SALE_OPT_OUT = "SaleOptOut";
13-
public static String TARGETED_ADVERTISING_OPT_OUT = "TargetedAdvertisingOptOut";
14-
public static String SENSITIVE_DATA_PROCESSING = "SensitiveDataProcessing";
15-
public static String KNOWN_CHILD_SENSITIVE_DATA_CONSENTS = "KnownChildSensitiveDataConsents";
16-
public static String ADDITIONAL_DATA_PROCESSING_CONSENT = "AdditionalDataProcessingConsent";
17-
public static String MSPA_COVERED_TRANSACTION = "MspaCoveredTransaction";
18-
public static String MSPA_OPT_OUT_OPTION_MODE = "MspaOptOutOptionMode";
19-
public static String MSPA_SERVICE_PROVIDER_MODE = "MspaServiceProviderMode";
8+
public static final String VERSION = "Version";
9+
public static final String PROCESSING_NOTICE = "ProcessingNotice";
10+
public static final String SALE_OPT_OUT_NOTICE = "SaleOptOutNotice";
11+
public static final String TARGETED_ADVERTISING_OPT_OUT_NOTICE = "TargetedAdvertisingOptOutNotice";
12+
public static final String SALE_OPT_OUT = "SaleOptOut";
13+
public static final String TARGETED_ADVERTISING_OPT_OUT = "TargetedAdvertisingOptOut";
14+
public static final String SENSITIVE_DATA_PROCESSING = "SensitiveDataProcessing";
15+
public static final String KNOWN_CHILD_SENSITIVE_DATA_CONSENTS = "KnownChildSensitiveDataConsents";
16+
public static final String ADDITIONAL_DATA_PROCESSING_CONSENT = "AdditionalDataProcessingConsent";
17+
public static final String MSPA_COVERED_TRANSACTION = "MspaCoveredTransaction";
18+
public static final String MSPA_OPT_OUT_OPTION_MODE = "MspaOptOutOptionMode";
19+
public static final String MSPA_SERVICE_PROVIDER_MODE = "MspaServiceProviderMode";
2020

2121
//@formatter:off
22-
public static List<String> USFL_CORE_SEGMENT_FIELD_NAMES = Arrays.asList(new String[] {
22+
public static final List<String> USFL_CORE_SEGMENT_FIELD_NAMES = Arrays.asList(new String[] {
2323
UsFlField.VERSION,
2424
UsFlField.PROCESSING_NOTICE,
2525
UsFlField.SALE_OPT_OUT_NOTICE,

‎iabgpp-encoder/src/main/java/com/iab/gpp/encoder/field/UsMtField.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@
55

66
public class UsMtField {
77

8-
public static String VERSION = "Version";
9-
public static String SHARING_NOTICE = "SharingNotice";
10-
public static String SALE_OPT_OUT_NOTICE = "SaleOptOutNotice";
11-
public static String TARGETED_ADVERTISING_OPT_OUT_NOTICE = "TargetedAdvertisingOptOutNotice";
12-
public static String SALE_OPT_OUT = "SaleOptOut";
13-
public static String TARGETED_ADVERTISING_OPT_OUT = "TargetedAdvertisingOptOut";
14-
public static String SENSITIVE_DATA_PROCESSING = "SensitiveDataProcessing";
15-
public static String KNOWN_CHILD_SENSITIVE_DATA_CONSENTS = "KnownChildSensitiveDataConsents";
16-
public static String ADDITIONAL_DATA_PROCESSING_CONSENT = "AdditionalDataProcessingConsent";
17-
public static String MSPA_COVERED_TRANSACTION = "MspaCoveredTransaction";
18-
public static String MSPA_OPT_OUT_OPTION_MODE = "MspaOptOutOptionMode";
19-
public static String MSPA_SERVICE_PROVIDER_MODE = "MspaServiceProviderMode";
8+
public static final String VERSION = "Version";
9+
public static final String SHARING_NOTICE = "SharingNotice";
10+
public static final String SALE_OPT_OUT_NOTICE = "SaleOptOutNotice";
11+
public static final String TARGETED_ADVERTISING_OPT_OUT_NOTICE = "TargetedAdvertisingOptOutNotice";
12+
public static final String SALE_OPT_OUT = "SaleOptOut";
13+
public static final String TARGETED_ADVERTISING_OPT_OUT = "TargetedAdvertisingOptOut";
14+
public static final String SENSITIVE_DATA_PROCESSING = "SensitiveDataProcessing";
15+
public static final String KNOWN_CHILD_SENSITIVE_DATA_CONSENTS = "KnownChildSensitiveDataConsents";
16+
public static final String ADDITIONAL_DATA_PROCESSING_CONSENT = "AdditionalDataProcessingConsent";
17+
public static final String MSPA_COVERED_TRANSACTION = "MspaCoveredTransaction";
18+
public static final String MSPA_OPT_OUT_OPTION_MODE = "MspaOptOutOptionMode";
19+
public static final String MSPA_SERVICE_PROVIDER_MODE = "MspaServiceProviderMode";
2020

21-
public static String GPC_SEGMENT_TYPE = "GpcSegmentType";
22-
public static String GPC_SEGMENT_INCLUDED = "GpcSegmentIncluded";
23-
public static String GPC = "Gpc";
21+
public static final String GPC_SEGMENT_TYPE = "GpcSegmentType";
22+
public static final String GPC_SEGMENT_INCLUDED = "GpcSegmentIncluded";
23+
public static final String GPC = "Gpc";
2424

2525
//@formatter:off
26-
public static List<String> USMT_CORE_SEGMENT_FIELD_NAMES = Arrays.asList(new String[] {
26+
public static final List<String> USMT_CORE_SEGMENT_FIELD_NAMES = Arrays.asList(new String[] {
2727
UsMtField.VERSION,
2828
UsMtField.SHARING_NOTICE,
2929
UsMtField.SALE_OPT_OUT_NOTICE,

‎iabgpp-encoder/src/main/java/com/iab/gpp/encoder/field/UsOrField.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@
55

66
public class UsOrField {
77

8-
public static String VERSION = "Version";
9-
public static String PROCESSING_NOTICE = "ProcessingNotice";
10-
public static String SALE_OPT_OUT_NOTICE = "SaleOptOutNotice";
11-
public static String TARGETED_ADVERTISING_OPT_OUT_NOTICE = "TargetedAdvertisingOptOutNotice";
12-
public static String SALE_OPT_OUT = "SaleOptOut";
13-
public static String TARGETED_ADVERTISING_OPT_OUT = "TargetedAdvertisingOptOut";
14-
public static String SENSITIVE_DATA_PROCESSING = "SensitiveDataProcessing";
15-
public static String KNOWN_CHILD_SENSITIVE_DATA_CONSENTS = "KnownChildSensitiveDataConsents";
16-
public static String ADDITIONAL_DATA_PROCESSING_CONSENT = "AdditionalDataProcessingConsent";
17-
public static String MSPA_COVERED_TRANSACTION = "MspaCoveredTransaction";
18-
public static String MSPA_OPT_OUT_OPTION_MODE = "MspaOptOutOptionMode";
19-
public static String MSPA_SERVICE_PROVIDER_MODE = "MspaServiceProviderMode";
8+
public static final String VERSION = "Version";
9+
public static final String PROCESSING_NOTICE = "ProcessingNotice";
10+
public static final String SALE_OPT_OUT_NOTICE = "SaleOptOutNotice";
11+
public static final String TARGETED_ADVERTISING_OPT_OUT_NOTICE = "TargetedAdvertisingOptOutNotice";
12+
public static final String SALE_OPT_OUT = "SaleOptOut";
13+
public static final String TARGETED_ADVERTISING_OPT_OUT = "TargetedAdvertisingOptOut";
14+
public static final String SENSITIVE_DATA_PROCESSING = "SensitiveDataProcessing";
15+
public static final String KNOWN_CHILD_SENSITIVE_DATA_CONSENTS = "KnownChildSensitiveDataConsents";
16+
public static final String ADDITIONAL_DATA_PROCESSING_CONSENT = "AdditionalDataProcessingConsent";
17+
public static final String MSPA_COVERED_TRANSACTION = "MspaCoveredTransaction";
18+
public static final String MSPA_OPT_OUT_OPTION_MODE = "MspaOptOutOptionMode";
19+
public static final String MSPA_SERVICE_PROVIDER_MODE = "MspaServiceProviderMode";
2020

21-
public static String GPC_SEGMENT_TYPE = "GpcSegmentType";
22-
public static String GPC_SEGMENT_INCLUDED = "GpcSegmentIncluded";
23-
public static String GPC = "Gpc";
21+
public static final String GPC_SEGMENT_TYPE = "GpcSegmentType";
22+
public static final String GPC_SEGMENT_INCLUDED = "GpcSegmentIncluded";
23+
public static final String GPC = "Gpc";
2424

2525
//@formatter:off
26-
public static List<String> USOR_CORE_SEGMENT_FIELD_NAMES = Arrays.asList(new String[] {
26+
public static final List<String> USOR_CORE_SEGMENT_FIELD_NAMES = Arrays.asList(new String[] {
2727
UsOrField.VERSION,
2828
UsOrField.PROCESSING_NOTICE,
2929
UsOrField.SALE_OPT_OUT_NOTICE,

‎iabgpp-encoder/src/main/java/com/iab/gpp/encoder/field/UsTxField.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@
55

66
public class UsTxField {
77

8-
public static String VERSION = "Version";
9-
public static String PROCESSING_NOTICE = "ProcessingNotice";
10-
public static String SALE_OPT_OUT_NOTICE = "SaleOptOutNotice";
11-
public static String TARGETED_ADVERTISING_OPT_OUT_NOTICE = "TargetedAdvertisingOptOutNotice";
12-
public static String SALE_OPT_OUT = "SaleOptOut";
13-
public static String TARGETED_ADVERTISING_OPT_OUT = "TargetedAdvertisingOptOut";
14-
public static String SENSITIVE_DATA_PROCESSING = "SensitiveDataProcessing";
15-
public static String KNOWN_CHILD_SENSITIVE_DATA_CONSENTS = "KnownChildSensitiveDataConsents";
16-
public static String ADDITIONAL_DATA_PROCESSING_CONSENT = "AdditionalDataProcessingConsent";
17-
public static String MSPA_COVERED_TRANSACTION = "MspaCoveredTransaction";
18-
public static String MSPA_OPT_OUT_OPTION_MODE = "MspaOptOutOptionMode";
19-
public static String MSPA_SERVICE_PROVIDER_MODE = "MspaServiceProviderMode";
8+
public static final String VERSION = "Version";
9+
public static final String PROCESSING_NOTICE = "ProcessingNotice";
10+
public static final String SALE_OPT_OUT_NOTICE = "SaleOptOutNotice";
11+
public static final String TARGETED_ADVERTISING_OPT_OUT_NOTICE = "TargetedAdvertisingOptOutNotice";
12+
public static final String SALE_OPT_OUT = "SaleOptOut";
13+
public static final String TARGETED_ADVERTISING_OPT_OUT = "TargetedAdvertisingOptOut";
14+
public static final String SENSITIVE_DATA_PROCESSING = "SensitiveDataProcessing";
15+
public static final String KNOWN_CHILD_SENSITIVE_DATA_CONSENTS = "KnownChildSensitiveDataConsents";
16+
public static final String ADDITIONAL_DATA_PROCESSING_CONSENT = "AdditionalDataProcessingConsent";
17+
public static final String MSPA_COVERED_TRANSACTION = "MspaCoveredTransaction";
18+
public static final String MSPA_OPT_OUT_OPTION_MODE = "MspaOptOutOptionMode";
19+
public static final String MSPA_SERVICE_PROVIDER_MODE = "MspaServiceProviderMode";
2020

21-
public static String GPC_SEGMENT_TYPE = "GpcSegmentType";
22-
public static String GPC_SEGMENT_INCLUDED = "GpcSegmentIncluded";
23-
public static String GPC = "Gpc";
21+
public static final String GPC_SEGMENT_TYPE = "GpcSegmentType";
22+
public static final String GPC_SEGMENT_INCLUDED = "GpcSegmentIncluded";
23+
public static final String GPC = "Gpc";
2424

2525
//@formatter:off
26-
public static List<String> USTX_CORE_SEGMENT_FIELD_NAMES = Arrays.asList(new String[] {
26+
public static final List<String> USTX_CORE_SEGMENT_FIELD_NAMES = Arrays.asList(new String[] {
2727
UsTxField.VERSION,
2828
UsTxField.PROCESSING_NOTICE,
2929
UsTxField.SALE_OPT_OUT_NOTICE,

‎iabgpp-encoder/src/main/java/com/iab/gpp/encoder/section/UsFl.java‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
package com.iab.gpp.encoder.section;
22

33
import java.util.ArrayList;
4+
import java.util.Collections;
45
import java.util.List;
56
import com.iab.gpp.encoder.field.UsFlField;
67
import com.iab.gpp.encoder.segment.EncodableSegment;
78
import com.iab.gpp.encoder.segment.UsFlCoreSegment;
89

910
public class UsFl extends AbstractLazilyEncodableSection {
1011

11-
public static int ID = 13;
12-
public static int VERSION = 1;
13-
public static String NAME = "usfl";
12+
public static final int ID = 13;
13+
public static final int VERSION = 1;
14+
public static final String NAME = "usfl";
1415

1516
public UsFl() {
1617
super();
1718
}
1819

19-
public UsFl(String encodedString) {
20+
public UsFl(CharSequence encodedString) {
2021
super();
2122
decode(encodedString);
2223
}
@@ -38,21 +39,19 @@ public int getVersion() {
3839

3940
@Override
4041
protected List<EncodableSegment> initializeSegments() {
41-
List<EncodableSegment> segments = new ArrayList<>();
42-
segments.add(new UsFlCoreSegment());
43-
return segments;
42+
return Collections.singletonList(new UsFlCoreSegment());
4443
}
4544

4645
@Override
47-
protected List<EncodableSegment> decodeSection(String encodedString) {
46+
protected List<EncodableSegment> decodeSection(CharSequence encodedString) {
4847
List<EncodableSegment> segments = initializeSegments();
4948

5049
if(encodedString != null && !encodedString.isEmpty()) {
51-
String[] encodedSegments = encodedString.split("\\.");
50+
List<CharSequence> encodedSegments = SlicedCharSequence.split(encodedString, '.');
5251

5352
for (int i = 0; i < segments.size(); i++) {
54-
if (encodedSegments.length > i) {
55-
segments.get(i).decode(encodedSegments[i]);
53+
if (encodedSegments.size() > i) {
54+
segments.get(i).decode(encodedSegments.get(i));
5655
}
5756
}
5857
}
@@ -62,7 +61,7 @@ protected List<EncodableSegment> decodeSection(String encodedString) {
6261

6362
@Override
6463
protected String encodeSection(List<EncodableSegment> segments) {
65-
List<String> encodedSegments = new ArrayList<>();
64+
List<String> encodedSegments = new ArrayList<>(segments.size());
6665
for (EncodableSegment segment : segments) {
6766
encodedSegments.add(segment.encode());
6867
}

‎iabgpp-encoder/src/main/java/com/iab/gpp/encoder/section/UsMt.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99

1010
public class UsMt extends AbstractLazilyEncodableSection {
1111

12-
public static int ID = 14;
13-
public static int VERSION = 1;
14-
public static String NAME = "usmt";
12+
public static final int ID = 14;
13+
public static final int VERSION = 1;
14+
public static final String NAME = "usmt";
1515

1616
public UsMt() {
1717
super();
1818
}
1919

20-
public UsMt(String encodedString) {
20+
public UsMt(CharSequence encodedString) {
2121
super();
2222
decode(encodedString);
2323
}
@@ -46,19 +46,19 @@ protected List<EncodableSegment> initializeSegments() {
4646
}
4747

4848
@Override
49-
protected List<EncodableSegment> decodeSection(String encodedString) {
49+
protected List<EncodableSegment> decodeSection(CharSequence encodedString) {
5050
List<EncodableSegment> segments = initializeSegments();
5151

5252
if(encodedString != null && !encodedString.isEmpty()) {
53-
String[] encodedSegments = encodedString.split("\\.");
53+
List<CharSequence> encodedSegments = SlicedCharSequence.split(encodedString, '.');
5454

55-
if(encodedSegments.length > 0) {
56-
segments.get(0).decode(encodedSegments[0]);
55+
if (encodedSegments.size() > 0) {
56+
segments.get(0).decode(encodedSegments.get(0));
5757
}
5858

59-
if(encodedSegments.length > 1) {
59+
if (encodedSegments.size() > 1) {
6060
segments.get(1).setFieldValue(UsMtField.GPC_SEGMENT_INCLUDED, true);
61-
segments.get(1).decode(encodedSegments[1]);
61+
segments.get(1).decode(encodedSegments.get(1));
6262
} else {
6363
segments.get(1).setFieldValue(UsMtField.GPC_SEGMENT_INCLUDED, false);
6464
}
@@ -69,7 +69,7 @@ protected List<EncodableSegment> decodeSection(String encodedString) {
6969

7070
@Override
7171
protected String encodeSection(List<EncodableSegment> segments) {
72-
List<String> encodedSegments = new ArrayList<>();
72+
List<String> encodedSegments = new ArrayList<>(segments.size());
7373

7474
if(!segments.isEmpty()) {
7575
encodedSegments.add(segments.get(0).encode());

‎iabgpp-encoder/src/main/java/com/iab/gpp/encoder/section/UsOr.java‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.iab.gpp.encoder.section;
22

3+
import java.util.Arrays;
34
import java.util.ArrayList;
45
import java.util.List;
56
import com.iab.gpp.encoder.field.UsOrField;
@@ -9,15 +10,15 @@
910

1011
public class UsOr extends AbstractLazilyEncodableSection {
1112

12-
public static int ID = 15;
13-
public static int VERSION = 1;
14-
public static String NAME = "usor";
13+
public static final int ID = 15;
14+
public static final int VERSION = 1;
15+
public static final String NAME = "usor";
1516

1617
public UsOr() {
1718
super();
1819
}
1920

20-
public UsOr(String encodedString) {
21+
public UsOr(CharSequence encodedString) {
2122
super();
2223
decode(encodedString);
2324
}
@@ -39,26 +40,23 @@ public int getVersion() {
3940

4041
@Override
4142
protected List<EncodableSegment> initializeSegments() {
42-
List<EncodableSegment> segments = new ArrayList<>();
43-
segments.add(new UsOrCoreSegment());
44-
segments.add(new UsOrGpcSegment());
45-
return segments;
43+
return Arrays.asList(new UsOrCoreSegment(), new UsOrGpcSegment());
4644
}
4745

4846
@Override
49-
protected List<EncodableSegment> decodeSection(String encodedString) {
47+
protected List<EncodableSegment> decodeSection(CharSequence encodedString) {
5048
List<EncodableSegment> segments = initializeSegments();
5149

5250
if(encodedString != null && !encodedString.isEmpty()) {
53-
String[] encodedSegments = encodedString.split("\\.");
51+
List<CharSequence> encodedSegments = SlicedCharSequence.split(encodedString, '.');
5452

55-
if(encodedSegments.length > 0) {
56-
segments.get(0).decode(encodedSegments[0]);
53+
if (encodedSegments.size() > 0) {
54+
segments.get(0).decode(encodedSegments.get(0));
5755
}
5856

59-
if(encodedSegments.length > 1) {
57+
if (encodedSegments.size() > 1) {
6058
segments.get(1).setFieldValue(UsOrField.GPC_SEGMENT_INCLUDED, true);
61-
segments.get(1).decode(encodedSegments[1]);
59+
segments.get(1).decode(encodedSegments.get(1));
6260
} else {
6361
segments.get(1).setFieldValue(UsOrField.GPC_SEGMENT_INCLUDED, false);
6462
}
@@ -69,7 +67,7 @@ protected List<EncodableSegment> decodeSection(String encodedString) {
6967

7068
@Override
7169
protected String encodeSection(List<EncodableSegment> segments) {
72-
List<String> encodedSegments = new ArrayList<>();
70+
List<String> encodedSegments = new ArrayList<>(segments.size());
7371

7472
if(!segments.isEmpty()) {
7573
encodedSegments.add(segments.get(0).encode());

0 commit comments

Comments
 (0)