Skip to content

Commit

Permalink
Code clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
@benfortuna
benfortuna committed Mar 8, 2022
1 parent 74008dc commit efe497a
Show file tree
Hide file tree
Showing 23 changed files with 244 additions and 302 deletions.
19 changes: 7 additions & 12 deletions src/main/java/net/fortuna/ical4j/model/parameter/CuType.java
View file
Expand Up @@ -112,19 +112,14 @@ public Factory() {

@Override
public CuType createParameter(final String value) throws URISyntaxException {
CuType parameter = new CuType(value);
if (CuType.INDIVIDUAL.equals(parameter)) {
parameter = CuType.INDIVIDUAL;
} else if (CuType.GROUP.equals(parameter)) {
parameter = CuType.GROUP;
} else if (CuType.RESOURCE.equals(parameter)) {
parameter = CuType.RESOURCE;
} else if (CuType.ROOM.equals(parameter)) {
parameter = CuType.ROOM;
} else if (CuType.UNKNOWN.equals(parameter)) {
parameter = CuType.UNKNOWN;
switch (value) {
case VALUE_INDIVIDUAL: return INDIVIDUAL;
case VALUE_GROUP: return GROUP;
case VALUE_RESOURCE: return RESOURCE;
case VALUE_ROOM: return ROOM;
case VALUE_UNKNOWN: return UNKNOWN;
}
return parameter;
return new CuType(value);
}
}

Expand Down
13 changes: 4 additions & 9 deletions src/main/java/net/fortuna/ical4j/model/parameter/Derived.java
View file
Expand Up @@ -99,16 +99,11 @@ public Factory() {
super(DERIVED);
}

public Derived createParameter(final String value)
throws URISyntaxException {
if (Boolean.TRUE.toString().equals(value)) {
return Derived.TRUE;
public Derived createParameter(final String value) throws URISyntaxException {
switch (value) {
case VALUE_TRUE: return TRUE;
case VALUE_FALSE: return FALSE;
}

if (Boolean.FALSE.toString().equals(value)) {
return Derived.FALSE;
}

return new Derived(value);
}
}
Expand Down
13 changes: 7 additions & 6 deletions src/main/java/net/fortuna/ical4j/model/parameter/Encoding.java
View file
Expand Up @@ -153,13 +153,14 @@ public Factory() {

@Override
public Encoding createParameter(final String value) throws URISyntaxException {
Encoding parameter = new Encoding(value);
if (Encoding.EIGHT_BIT.equals(parameter)) {
parameter = Encoding.EIGHT_BIT;
} else if (Encoding.BASE64.equals(parameter)) {
parameter = Encoding.BASE64;
switch (value) {
case VALUE_BASE64: return BASE64;
case VALUE_BINARY: return BINARY;
case VALUE_EIGHT_BIT: return EIGHT_BIT;
case VALUE_QUOTED_PRINTABLE: return QUOTED_PRINTABLE;
case VALUE_SEVEN_BIT: return SEVEN_BIT;
}
return parameter;
return new Encoding(value);
}
}

Expand Down
16 changes: 6 additions & 10 deletions src/main/java/net/fortuna/ical4j/model/parameter/FbType.java
View file
Expand Up @@ -107,17 +107,13 @@ public Factory() {

@Override
public FbType createParameter(final String value) throws URISyntaxException {
FbType parameter = new FbType(value);
if (FbType.FREE.equals(parameter)) {
parameter = FbType.FREE;
} else if (FbType.BUSY.equals(parameter)) {
parameter = FbType.BUSY;
} else if (FbType.BUSY_TENTATIVE.equals(parameter)) {
parameter = FbType.BUSY_TENTATIVE;
} else if (FbType.BUSY_UNAVAILABLE.equals(parameter)) {
parameter = FbType.BUSY_UNAVAILABLE;
switch (value) {
case VALUE_BUSY: return BUSY;
case VALUE_BUSY_TENTATIVE: return BUSY_TENTATIVE;
case VALUE_BUSY_UNAVAILABLE: return BUSY_UNAVAILABLE;
case VALUE_FREE: return FREE;
}
return parameter;
return new FbType(value);
}
}

Expand Down
25 changes: 9 additions & 16 deletions src/main/java/net/fortuna/ical4j/model/parameter/PartStat.java
View file
Expand Up @@ -126,23 +126,16 @@ public Factory() {

@Override
public PartStat createParameter(final String value) throws URISyntaxException {
PartStat parameter = new PartStat(value);
if (PartStat.NEEDS_ACTION.equals(parameter)) {
parameter = PartStat.NEEDS_ACTION;
} else if (PartStat.ACCEPTED.equals(parameter)) {
parameter = PartStat.ACCEPTED;
} else if (PartStat.DECLINED.equals(parameter)) {
parameter = PartStat.DECLINED;
} else if (PartStat.TENTATIVE.equals(parameter)) {
parameter = PartStat.TENTATIVE;
} else if (PartStat.DELEGATED.equals(parameter)) {
parameter = PartStat.DELEGATED;
} else if (PartStat.COMPLETED.equals(parameter)) {
parameter = PartStat.COMPLETED;
} else if (PartStat.IN_PROCESS.equals(parameter)) {
parameter = PartStat.IN_PROCESS;
switch (value) {
case VALUE_ACCEPTED: return ACCEPTED;
case VALUE_COMPLETED: return COMPLETED;
case VALUE_DECLINED: return DECLINED;
case VALUE_DELEGATED: return DELEGATED;
case VALUE_IN_PROCESS: return IN_PROCESS;
case VALUE_NEEDS_ACTION: return NEEDS_ACTION;
case VALUE_TENTATIVE: return TENTATIVE;
}
return parameter;
return new PartStat(value);
}
}

Expand Down
10 changes: 4 additions & 6 deletions src/main/java/net/fortuna/ical4j/model/parameter/Range.java
View file
Expand Up @@ -103,13 +103,11 @@ public Factory() {

@Override
public Range createParameter(final String value) throws URISyntaxException {
Range parameter = new Range(value);
if (Range.THISANDFUTURE.equals(parameter)) {
parameter = Range.THISANDFUTURE;
} else if (Range.THISANDPRIOR.equals(parameter)) {
parameter = Range.THISANDPRIOR;
switch (value) {
case VALUE_THISANDFUTURE: return THISANDFUTURE;
case VALUE_THISANDPRIOR: return THISANDPRIOR;
}
return parameter;
return new Range(value);
}
}

Expand Down
16 changes: 6 additions & 10 deletions src/main/java/net/fortuna/ical4j/model/parameter/RelType.java
View file
Expand Up @@ -105,17 +105,13 @@ public Factory() {

@Override
public RelType createParameter(final String value) throws URISyntaxException {
RelType parameter = new RelType(value);
if (RelType.PARENT.equals(parameter)) {
parameter = RelType.PARENT;
} else if (RelType.CHILD.equals(parameter)) {
parameter = RelType.CHILD;
} else if (RelType.SIBLING.equals(parameter)) {
parameter = RelType.SIBLING;
} else if (RelType.SNOOZE.equals(parameter)) {
parameter = RelType.SNOOZE;
switch (value) {
case VALUE_CHILD: return CHILD;
case VALUE_PARENT: return PARENT;
case VALUE_SIBLING: return SIBLING;
case VALUE_SNOOZE: return SNOOZE;
}
return parameter;
return new RelType(value);
}
}
}
10 changes: 4 additions & 6 deletions src/main/java/net/fortuna/ical4j/model/parameter/Related.java
View file
Expand Up @@ -96,13 +96,11 @@ public Factory() {

@Override
public Related createParameter(final String value) throws URISyntaxException {
Related parameter = new Related(value);
if (Related.START.equals(parameter)) {
parameter = Related.START;
} else if (Related.END.equals(parameter)) {
parameter = Related.END;
switch (value) {
case VALUE_END: return END;
case VALUE_START: return START;
}
return parameter;
return new Related(value);
}
}

Expand Down
16 changes: 6 additions & 10 deletions src/main/java/net/fortuna/ical4j/model/parameter/Role.java
View file
Expand Up @@ -105,17 +105,13 @@ public Factory() {

@Override
public Role createParameter(final String value) throws URISyntaxException {
Role parameter = new Role(value);
if (Role.CHAIR.equals(parameter)) {
parameter = Role.CHAIR;
} else if (Role.REQ_PARTICIPANT.equals(parameter)) {
parameter = Role.REQ_PARTICIPANT;
} else if (Role.OPT_PARTICIPANT.equals(parameter)) {
parameter = Role.OPT_PARTICIPANT;
} else if (Role.NON_PARTICIPANT.equals(parameter)) {
parameter = Role.NON_PARTICIPANT;
switch (value) {
case VALUE_CHAIR: return CHAIR;
case VALUE_NON_PARTICIPANT: return NON_PARTICIPANT;
case VALUE_OPT_PARTICIPANT: return OPT_PARTICIPANT;
case VALUE_REQ_PARTICIPANT: return REQ_PARTICIPANT;
}
return parameter;
return new Role(value);
}
}

Expand Down
12 changes: 5 additions & 7 deletions src/main/java/net/fortuna/ical4j/model/parameter/Rsvp.java
View file
Expand Up @@ -103,7 +103,7 @@ public final String getValue() {
* {@inheritDoc}
*/
@Override
public final Parameter copy() {
public final Rsvp copy() {
if (rsvp) {
return TRUE;
} else {
Expand All @@ -120,13 +120,11 @@ public Factory() {

@Override
public Rsvp createParameter(final String value) throws URISyntaxException {
Rsvp parameter = new Rsvp(value);
if (Rsvp.TRUE.equals(parameter)) {
parameter = Rsvp.TRUE;
} else if (Rsvp.FALSE.equals(parameter)) {
parameter = Rsvp.FALSE;
switch (value) {
case VALUE_FALSE: return FALSE;
case VALUE_TRUE: return TRUE;
}
return parameter;
return new Rsvp(value);
}
}

Expand Down
14 changes: 5 additions & 9 deletions src/main/java/net/fortuna/ical4j/model/parameter/ScheduleAgent.java
View file
Expand Up @@ -91,16 +91,12 @@ public Factory() {

@Override
public ScheduleAgent createParameter(final String value) throws URISyntaxException {
final ScheduleAgent parameter = new ScheduleAgent(value);
if (ScheduleAgent.SERVER.equals(parameter)) {
return ScheduleAgent.SERVER;
} else if (ScheduleAgent.CLIENT.equals(parameter)) {
return ScheduleAgent.CLIENT;
} else if (ScheduleAgent.NONE.equals(parameter)) {
return ScheduleAgent.NONE;
switch (value) {
case VALUE_CLIENT: return CLIENT;
case VALUE_NONE: return NONE;
case VALUE_SERVER: return SERVER;
}
return parameter;
return new ScheduleAgent(value);
}
}

}
47 changes: 16 additions & 31 deletions src/main/java/net/fortuna/ical4j/model/parameter/Value.java
View file
Expand Up @@ -174,38 +174,23 @@ public Factory() {

@Override
public Value createParameter(final String value) throws URISyntaxException {
Value parameter = new Value(value);
if (Value.BINARY.equals(parameter)) {
parameter = Value.BINARY;
} else if (Value.BOOLEAN.equals(parameter)) {
parameter = Value.BOOLEAN;
} else if (Value.CAL_ADDRESS.equals(parameter)) {
parameter = Value.CAL_ADDRESS;
} else if (Value.DATE.equals(parameter)) {
parameter = Value.DATE;
} else if (Value.DATE_TIME.equals(parameter)) {
parameter = Value.DATE_TIME;
} else if (Value.DURATION.equals(parameter)) {
parameter = Value.DURATION;
} else if (Value.FLOAT.equals(parameter)) {
parameter = Value.FLOAT;
} else if (Value.INTEGER.equals(parameter)) {
parameter = Value.INTEGER;
} else if (Value.PERIOD.equals(parameter)) {
parameter = Value.PERIOD;
} else if (Value.RECUR.equals(parameter)) {
parameter = Value.RECUR;
} else if (Value.TEXT.equals(parameter)) {
parameter = Value.TEXT;
} else if (Value.TIME.equals(parameter)) {
parameter = Value.TIME;
} else if (Value.URI.equals(parameter)) {
parameter = Value.URI;
} else if (Value.UTC_OFFSET.equals(parameter)) {
parameter = Value.UTC_OFFSET;
switch (value) {
case VALUE_BINARY: return BINARY;
case VALUE_BOOLEAN: return BOOLEAN;
case VALUE_DATE: return DATE;
case VALUE_CAL_ADDRESS: return CAL_ADDRESS;
case VALUE_DATE_TIME: return DATE_TIME;
case VALUE_DURATION: return DURATION;
case VALUE_FLOAT: return FLOAT;
case VALUE_INTEGER: return INTEGER;
case VALUE_PERIOD: return PERIOD;
case VALUE_RECUR: return RECUR;
case VALUE_TEXT: return TEXT;
case VALUE_TIME: return TIME;
case VALUE_URI: return URI;
case VALUE_UTC_OFFSET: return UTC_OFFSET;
}
return parameter;
return new Value(value);
}
}

}
19 changes: 13 additions & 6 deletions src/main/java/net/fortuna/ical4j/model/property/Acknowledged.java
View file
Expand Up @@ -71,7 +71,11 @@ public class Acknowledged extends UtcProperty{
private static final long serialVersionUID = 596619479148598528L;

public Acknowledged() {
super(ACKNOWLEDGED, new Factory());
this(new Factory());
}

private Acknowledged(PropertyFactory<Acknowledged> factory) {
super(ACKNOWLEDGED, factory);
}

/**
Expand All @@ -87,9 +91,12 @@ public Acknowledged(final String aValue) throws ParseException {
* @param aValue a value string for this component
* @throws ParseException where the specified value string is not a valid date-time/date representation
*/
public Acknowledged(final ParameterList aList, final String aValue)
throws ParseException {
super(ACKNOWLEDGED, aList, new Factory());
public Acknowledged(final ParameterList aList, final String aValue) throws ParseException {
this(aList, aValue, new Factory());
}

private Acknowledged(final ParameterList aList, final String aValue, PropertyFactory<Acknowledged> factory) throws ParseException {
super(ACKNOWLEDGED, aList, factory);
setValue(aValue);
}

Expand Down Expand Up @@ -124,12 +131,12 @@ public Factory() {
@Override
public Acknowledged createProperty(final ParameterList parameters, final String value)
throws IOException, URISyntaxException, ParseException {
return new Acknowledged(parameters, value);
return new Acknowledged(parameters, value, this);
}

@Override
public Acknowledged createProperty() {
return new Acknowledged();
return new Acknowledged(this);
}
}
}

0 comments on commit efe497a

Please sign in to comment.