Skip to content

Commit dd3a6c9

Browse files
benfortunabenfortuna
authored
Merge pull request #28 from ical4j/develop
Support multiple entities in a card
2 parents 604d31b + 58ea88c commit dd3a6c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+705
-610
lines changed

‎.github/workflows/publish-snapshots.yml‎

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,13 @@ on:
88
permissions: read-all
99

1010
jobs:
11-
gradle:
12-
name: Test with Java ${{ matrix.jdk }}
13-
runs-on: ubuntu-latest
14-
strategy:
15-
fail-fast: false
16-
matrix:
17-
jdk: [ '11', '17', '21' ] # removed JDK due to plugin errors
18-
19-
steps:
20-
- uses: actions/checkout@v4
21-
with:
22-
fetch-depth: 0
23-
24-
- name: Set up JDK ${{ matrix.jdk }}
25-
uses: actions/setup-java@v3
26-
with:
27-
distribution: temurin
28-
java-version: ${{ matrix.jdk }}
29-
cache: 'gradle'
30-
31-
- name: Setup Gradle
32-
uses: gradle/gradle-build-action@v2
33-
34-
- name: Execute Gradle build
35-
run: ./gradlew check -x test --console=plain --warning-mode all
11+
test:
12+
uses: ical4j/ical4j/.github/workflows/test.yml@develop
3613

3714
publish:
3815
name: Publish Artifact
39-
needs: gradle
40-
if: ${{ needs.gradle.result == 'success' }}
16+
needs: test
17+
if: ${{ needs.test.result == 'success' }}
4118
runs-on: ubuntu-latest
4219

4320
steps:

‎.palantir/revapi.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ acceptedBreaks:
77
\ net.fortuna.ical4j.model.PropertyListAccessor::getProperty(===java.lang.Enum<?>===)\
88
\ @ net.fortuna.ical4j.vcard.VCard"
99
justification: "align_with_ical4j_property_accessor"
10+
- code: "java.class.defaultSerializationChanged"
11+
old: "class net.fortuna.ical4j.vcard.VCard"
12+
new: "class net.fortuna.ical4j.vcard.VCard"
13+
justification: "multiple_entities_in_card"
1014
- code: "java.class.finalClassInheritsFromNewClass"
1115
old: "class net.fortuna.ical4j.vcard.parameter.Altid"
1216
new: "class net.fortuna.ical4j.vcard.parameter.Altid"
@@ -231,6 +235,10 @@ acceptedBreaks:
231235
old: "class net.fortuna.ical4j.vcard.property.Version"
232236
new: "class net.fortuna.ical4j.vcard.property.Version"
233237
justification: "major_refactor"
238+
- code: "java.class.noLongerFinal"
239+
old: "class net.fortuna.ical4j.vcard.VCard"
240+
new: "class net.fortuna.ical4j.vcard.VCard"
241+
justification: "multiple_entities_in_card"
234242
- code: "java.class.noLongerFinal"
235243
old: "class net.fortuna.ical4j.vcard.property.Address"
236244
new: "class net.fortuna.ical4j.vcard.property.Address"
@@ -1095,6 +1103,10 @@ acceptedBreaks:
10951103
old: "class net.fortuna.ical4j.vcard.property.XProperty"
10961104
new: "class net.fortuna.ical4j.vcard.property.XProperty"
10971105
justification: "major_refactor"
1106+
- code: "java.class.nowImplementsInterface"
1107+
old: "class net.fortuna.ical4j.vcard.VCard"
1108+
new: "class net.fortuna.ical4j.vcard.VCard"
1109+
justification: "multiple_entities_in_card"
10981110
- code: "java.class.nowImplementsInterface"
10991111
old: "class net.fortuna.ical4j.vcard.property.BDay"
11001112
new: "class net.fortuna.ical4j.vcard.property.BDay<T extends java.time.temporal.Temporal>"
@@ -1121,6 +1133,9 @@ acceptedBreaks:
11211133
- code: "java.class.removed"
11221134
old: "class net.fortuna.ical4j.vcard.Property"
11231135
justification: "major_refactor"
1136+
- code: "java.class.removed"
1137+
old: "class net.fortuna.ical4j.vcard.VCardFactory"
1138+
justification: "refactoring_entity"
11241139
- code: "java.element.nowDeprecated"
11251140
old: "class net.fortuna.ical4j.vcard.property.Agent"
11261141
new: "class net.fortuna.ical4j.vcard.property.Agent"
@@ -1901,6 +1916,11 @@ acceptedBreaks:
19011916
new: "method void net.fortuna.ical4j.vcard.property.Member::<init>(net.fortuna.ical4j.model.ParameterList,\
19021917
\ java.lang.String)"
19031918
justification: "major_version_update"
1919+
- code: "java.method.exception.checkedRemoved"
1920+
old: "method void net.fortuna.ical4j.vcard.property.Member::<init>(java.util.List<net.fortuna.ical4j.vcard.Parameter>,\
1921+
\ java.lang.String) throws java.net.URISyntaxException"
1922+
new: "method void net.fortuna.ical4j.vcard.property.Member::<init>(net.fortuna.ical4j.vcard.Entity)"
1923+
justification: "multiple_entities_in_card"
19041924
- code: "java.method.exception.checkedRemoved"
19051925
old: "method void net.fortuna.ical4j.vcard.property.Member::<init>(java.util.List<net.fortuna.ical4j.vcard.Parameter>,\
19061926
\ java.lang.String) throws java.net.URISyntaxException"
@@ -3195,6 +3215,11 @@ acceptedBreaks:
31953215
new: "method T net.fortuna.ical4j.model.PropertyFactory<T extends net.fortuna.ical4j.model.Property>::createProperty(java.lang.String)\
31963216
\ throws java.net.URISyntaxException @ net.fortuna.ical4j.vcard.property.Version.Factory"
31973217
justification: "major_refactor"
3218+
- code: "java.method.numberOfParametersChanged"
3219+
old: "method void net.fortuna.ical4j.vcard.property.Member::<init>(java.util.List<net.fortuna.ical4j.vcard.Parameter>,\
3220+
\ java.lang.String) throws java.net.URISyntaxException"
3221+
new: "method void net.fortuna.ical4j.vcard.property.Member::<init>(net.fortuna.ical4j.vcard.Entity)"
3222+
justification: "multiple_entities_in_card"
31983223
- code: "java.method.numberOfParametersChanged"
31993224
old: "method void net.fortuna.ical4j.vcard.property.Member::<init>(java.util.List<net.fortuna.ical4j.vcard.Parameter>,\
32003225
\ java.lang.String) throws java.net.URISyntaxException"
@@ -3238,6 +3263,10 @@ acceptedBreaks:
32383263
old: "parameter void net.fortuna.ical4j.vcard.VCard::<init>(===java.util.List<net.fortuna.ical4j.vcard.Property>===)"
32393264
new: "parameter void net.fortuna.ical4j.vcard.VCard::<init>(===net.fortuna.ical4j.model.PropertyList===)"
32403265
justification: "major_refactor"
3266+
- code: "java.method.parameterTypeChanged"
3267+
old: "parameter void net.fortuna.ical4j.vcard.VCard::<init>(===java.util.List<net.fortuna.ical4j.vcard.Property>===)"
3268+
new: "parameter void net.fortuna.ical4j.vcard.VCard::<init>(===net.fortuna.ical4j.vcard.EntityList===)"
3269+
justification: "multiple_entities_in_card"
32413270
- code: "java.method.parameterTypeChanged"
32423271
old: "parameter void net.fortuna.ical4j.vcard.property.Address::<init>(===java.util.List<net.fortuna.ical4j.vcard.Parameter>===,\
32433272
\ java.lang.String) throws java.text.ParseException"
@@ -3602,12 +3631,22 @@ acceptedBreaks:
36023631
new: "parameter void net.fortuna.ical4j.vcard.property.XProperty::<init>(net.fortuna.ical4j.vcard.Group,\
36033632
\ java.lang.String, ===net.fortuna.ical4j.model.ParameterList===, java.lang.String)"
36043633
justification: "major_refactor"
3634+
- code: "java.method.removed"
3635+
old: "method <T extends net.fortuna.ical4j.vcard.Property> T net.fortuna.ical4j.vcard.VCard::getProperty(net.fortuna.ical4j.vcard.Property.Id)"
3636+
justification: "multiple_entities_in_card"
36053637
- code: "java.method.removed"
36063638
old: "method java.util.List<net.fortuna.ical4j.vcard.Property> net.fortuna.ical4j.vcard.VCard::getExtendedProperties(java.lang.String)"
36073639
justification: "major_refactor"
3640+
- code: "java.method.removed"
3641+
old: "method java.util.List<net.fortuna.ical4j.vcard.Property> net.fortuna.ical4j.vcard.VCard::getProperties()"
3642+
justification: "multiple_entities_in_card"
36083643
- code: "java.method.removed"
36093644
old: "method java.util.List<net.fortuna.ical4j.vcard.Property> net.fortuna.ical4j.vcard.VCard::getProperties(net.fortuna.ical4j.vcard.Property.Id)"
36103645
justification: "major_refactor"
3646+
- code: "java.method.removed"
3647+
old: "method java.util.List<net.fortuna.ical4j.vcard.VCard> net.fortuna.ical4j.vcard.VCardBuilder::buildAll()\
3648+
\ throws java.io.IOException, net.fortuna.ical4j.data.ParserException"
3649+
justification: "multiple_entities_in_card"
36113650
- code: "java.method.removed"
36123651
old: "method net.fortuna.ical4j.vcard.Property net.fortuna.ical4j.vcard.VCard::getExtendedProperty(java.lang.String)"
36133652
justification: "major_refactor"
@@ -3668,6 +3707,12 @@ acceptedBreaks:
36683707
\ throws java.net.URISyntaxException @ net.fortuna.ical4j.vcard.PropertyFactory<T\
36693708
\ extends net.fortuna.ical4j.vcard.GroupProperty>"
36703709
justification: "major_refactor"
3710+
- code: "java.method.returnTypeChanged"
3711+
old: "method java.util.List<net.fortuna.ical4j.vcard.VCard> net.fortuna.ical4j.vcard.VCardBuilder::buildAll()\
3712+
\ throws java.io.IOException, net.fortuna.ical4j.data.ParserException"
3713+
new: "method net.fortuna.ical4j.vcard.EntityList net.fortuna.ical4j.vcard.VCardBuilder::buildAll()\
3714+
\ throws java.io.IOException, net.fortuna.ical4j.data.ParserException"
3715+
justification: "refactoring_entity"
36713716
- code: "java.method.returnTypeChanged"
36723717
old: "method java.util.List<net.fortuna.ical4j.vcard.VCard> net.fortuna.ical4j.vcard.VCardBuilder::buildAll()\
36733718
\ throws java.io.IOException, net.fortuna.ical4j.data.ParserException"

‎build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ dependencies {
4848
// spock
4949
testImplementation platform("org.spockframework:spock-bom:$spockVersion"),
5050
"org.spockframework:spock-core",
51-
"org.apache.logging.log4j:log4j-core:$log4jVersion"
51+
"org.apache.logging.log4j:log4j-core:$log4jVersion",
52+
"org.apache.logging.log4j:log4j-slf4j2-impl:$log4jVersion"
5253

5354
testRuntimeOnly("org.mnode.ical4j:ical4j:$ical4jVersion") {
5455
capabilities {

‎gradle.properties‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
ical4jVersion=4.0.2
2-
3-
log4jVersion=2.22.1
4-
commonsIoVersion=2.15.1
5-
groovyVersion=3.0.20
1+
ical4jVersion=4.0.4
2+
log4jVersion=2.23.1
3+
commonsIoVersion=2.16.1
4+
groovyVersion=3.0.22
65
bndVersion=6.3.1
7-
junitVintageVersion=5.10.2
6+
junitVintageVersion=5.10.3
87
spockVersion=2.4-M1-groovy-3.0
98

109
jacoco_htmlReport=true

‎src/main/groovy/net/fortuna/ical4j/vcard/ContentBuilder.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class ContentBuilder extends FactoryBuilderSupport {
6868
}
6969

7070
def registerVCard() {
71-
registerFactory('vcard', new VCardFactory())
71+
registerFactory('entity', new EntityFactory())
7272
}
7373

7474
def registerProperties() {

src/main/groovy/net/fortuna/ical4j/vcard/VCardFactory.groovy renamed to src/main/groovy/net/fortuna/ical4j/vcard/EntityFactory.groovy

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ import net.fortuna.ical4j.model.Property
4141
* @author fortuna
4242
*
4343
*/
44-
class VCardFactory extends groovy.util.AbstractFactory {
44+
class EntityFactory extends groovy.util.AbstractFactory {
4545

4646
Object newInstance(FactoryBuilderSupport builder, Object name, Object value, Map attributes) throws InstantiationException, IllegalAccessException {
47-
VCard card
48-
if (FactoryBuilderSupport.checkValueIsType(value, name, VCard.class)) {
49-
card = (VCard) value
47+
Entity entity
48+
if (FactoryBuilderSupport.checkValueIsType(value, name, Entity.class)) {
49+
entity = (Entity) value
5050
} else {
51-
card = new VCard()
51+
entity = new Entity()
5252
}
53-
return card
53+
return entity
5454
}
5555

5656
void setChild(FactoryBuilderSupport build, Object parent, Object child) {

0 commit comments

Comments
 (0)