Skip to content

Fix handling links to not existing objects for java #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tom-hg57 merged 2 commits into from
Jul 26, 2025
Merged

Fix handling links to not existing objects for java #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e71fd6c
Update generated java files created by cimgen
tom-hg57 Jul 20, 2025
3e7a301
Adapt unit tests and add more unit tests for reader and writer
tom-hg57 Jul 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 25 additions & 5 deletions CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ACDCConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ protected ACDCConverter(String cimType, String rdfid) {
*/
private Set<ACDCConverterDCTerminal> DCTerminals = new HashSet<>(); // OneToMany

private Set<String> DCTerminalsIdSet = new HashSet<>();

public Set<ACDCConverterDCTerminal> getDCTerminals() {
return DCTerminals;
}
Expand All @@ -50,15 +52,23 @@ public void setDCTerminals(ACDCConverterDCTerminal _object_) {
if (!DCTerminals.contains(_object_)) {
DCTerminals.add(_object_);
_object_.setDCConductingEquipment(this);
DCTerminalsIdSet.add(_object_.getRdfid());
}
}

private static Object getDCTerminals(BaseClass _this_) {
return ((ACDCConverter) _this_).getDCTerminals();
var objs = ((ACDCConverter) _this_).getDCTerminals();
var ids = ((ACDCConverter) _this_).DCTerminalsIdSet;
if (objs.size() < ids.size()) {
return ids;
}
return objs;
}

private static void setDCTerminals(BaseClass _this_, Object _value_) {
if (_value_ instanceof ACDCConverterDCTerminal) {
if (_value_ instanceof String) {
((ACDCConverter) _this_).DCTerminalsIdSet.add((String) _value_);
} else if (_value_ instanceof ACDCConverterDCTerminal) {
((ACDCConverter) _this_).setDCTerminals((ACDCConverterDCTerminal) _value_);
} else {
throw new IllegalArgumentException("Object is not ACDCConverterDCTerminal");
Expand All @@ -70,23 +80,33 @@ private static void setDCTerminals(BaseClass _this_, Object _value_) {
*/
private Terminal PccTerminal; // ManyToOne

private String PccTerminalId;

public Terminal getPccTerminal() {
return PccTerminal;
}

public void setPccTerminal(Terminal _object_) {
if (PccTerminal != _object_) {
PccTerminal = _object_;
PccTerminal.setConverterDCSides(this);
_object_.setConverterDCSides(this);
PccTerminalId = _object_.getRdfid();
}
}

private static Object getPccTerminal(BaseClass _this_) {
return ((ACDCConverter) _this_).getPccTerminal();
var obj = ((ACDCConverter) _this_).getPccTerminal();
var id = ((ACDCConverter) _this_).PccTerminalId;
if (obj == null && id != null) {
return id;
}
return obj;
}

private static void setPccTerminal(BaseClass _this_, Object _value_) {
if (_value_ instanceof Terminal) {
if (_value_ instanceof String) {
((ACDCConverter) _this_).PccTerminalId = (String) _value_;
} else if (_value_ instanceof Terminal) {
((ACDCConverter) _this_).setPccTerminal((Terminal) _value_);
} else {
throw new IllegalArgumentException("Object is not Terminal");
Expand Down
16 changes: 13 additions & 3 deletions CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ACDCConverterDCTerminal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,33 @@ protected ACDCConverterDCTerminal(String cimType, String rdfid) {
*/
private ACDCConverter DCConductingEquipment; // ManyToOne

private String DCConductingEquipmentId;

public ACDCConverter getDCConductingEquipment() {
return DCConductingEquipment;
}

public void setDCConductingEquipment(ACDCConverter _object_) {
if (DCConductingEquipment != _object_) {
DCConductingEquipment = _object_;
DCConductingEquipment.setDCTerminals(this);
_object_.setDCTerminals(this);
DCConductingEquipmentId = _object_.getRdfid();
}
}

private static Object getDCConductingEquipment(BaseClass _this_) {
return ((ACDCConverterDCTerminal) _this_).getDCConductingEquipment();
var obj = ((ACDCConverterDCTerminal) _this_).getDCConductingEquipment();
var id = ((ACDCConverterDCTerminal) _this_).DCConductingEquipmentId;
if (obj == null && id != null) {
return id;
}
return obj;
}

private static void setDCConductingEquipment(BaseClass _this_, Object _value_) {
if (_value_ instanceof ACDCConverter) {
if (_value_ instanceof String) {
((ACDCConverterDCTerminal) _this_).DCConductingEquipmentId = (String) _value_;
} else if (_value_ instanceof ACDCConverter) {
((ACDCConverterDCTerminal) _this_).setDCConductingEquipment((ACDCConverter) _value_);
} else {
throw new IllegalArgumentException("Object is not ACDCConverter");
Expand Down
44 changes: 37 additions & 7 deletions CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ACDCTerminal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,33 @@ protected ACDCTerminal(String cimType, String rdfid) {
*/
private BusNameMarker BusNameMarker; // ManyToOne

private String BusNameMarkerId;

public BusNameMarker getBusNameMarker() {
return BusNameMarker;
}

public void setBusNameMarker(BusNameMarker _object_) {
if (BusNameMarker != _object_) {
BusNameMarker = _object_;
BusNameMarker.setTerminal(this);
_object_.setTerminal(this);
BusNameMarkerId = _object_.getRdfid();
}
}

private static Object getBusNameMarker(BaseClass _this_) {
return ((ACDCTerminal) _this_).getBusNameMarker();
var obj = ((ACDCTerminal) _this_).getBusNameMarker();
var id = ((ACDCTerminal) _this_).BusNameMarkerId;
if (obj == null && id != null) {
return id;
}
return obj;
}

private static void setBusNameMarker(BaseClass _this_, Object _value_) {
if (_value_ instanceof BusNameMarker) {
if (_value_ instanceof String) {
((ACDCTerminal) _this_).BusNameMarkerId = (String) _value_;
} else if (_value_ instanceof BusNameMarker) {
((ACDCTerminal) _this_).setBusNameMarker((BusNameMarker) _value_);
} else {
throw new IllegalArgumentException("Object is not BusNameMarker");
Expand All @@ -71,6 +81,8 @@ private static void setBusNameMarker(BaseClass _this_, Object _value_) {
*/
private Set<Measurement> Measurements = new HashSet<>(); // OneToMany

private Set<String> MeasurementsIdSet = new HashSet<>();

public Set<Measurement> getMeasurements() {
return Measurements;
}
Expand All @@ -79,15 +91,23 @@ public void setMeasurements(Measurement _object_) {
if (!Measurements.contains(_object_)) {
Measurements.add(_object_);
_object_.setTerminal(this);
MeasurementsIdSet.add(_object_.getRdfid());
}
}

private static Object getMeasurements(BaseClass _this_) {
return ((ACDCTerminal) _this_).getMeasurements();
var objs = ((ACDCTerminal) _this_).getMeasurements();
var ids = ((ACDCTerminal) _this_).MeasurementsIdSet;
if (objs.size() < ids.size()) {
return ids;
}
return objs;
}

private static void setMeasurements(BaseClass _this_, Object _value_) {
if (_value_ instanceof Measurement) {
if (_value_ instanceof String) {
((ACDCTerminal) _this_).MeasurementsIdSet.add((String) _value_);
} else if (_value_ instanceof Measurement) {
((ACDCTerminal) _this_).setMeasurements((Measurement) _value_);
} else {
throw new IllegalArgumentException("Object is not Measurement");
Expand All @@ -100,6 +120,8 @@ private static void setMeasurements(BaseClass _this_, Object _value_) {
*/
private Set<OperationalLimitSet> OperationalLimitSet = new HashSet<>(); // OneToMany

private Set<String> OperationalLimitSetIdSet = new HashSet<>();

public Set<OperationalLimitSet> getOperationalLimitSet() {
return OperationalLimitSet;
}
Expand All @@ -108,15 +130,23 @@ public void setOperationalLimitSet(OperationalLimitSet _object_) {
if (!OperationalLimitSet.contains(_object_)) {
OperationalLimitSet.add(_object_);
_object_.setTerminal(this);
OperationalLimitSetIdSet.add(_object_.getRdfid());
}
}

private static Object getOperationalLimitSet(BaseClass _this_) {
return ((ACDCTerminal) _this_).getOperationalLimitSet();
var objs = ((ACDCTerminal) _this_).getOperationalLimitSet();
var ids = ((ACDCTerminal) _this_).OperationalLimitSetIdSet;
if (objs.size() < ids.size()) {
return ids;
}
return objs;
}

private static void setOperationalLimitSet(BaseClass _this_, Object _value_) {
if (_value_ instanceof OperationalLimitSet) {
if (_value_ instanceof String) {
((ACDCTerminal) _this_).OperationalLimitSetIdSet.add((String) _value_);
} else if (_value_ instanceof OperationalLimitSet) {
((ACDCTerminal) _this_).setOperationalLimitSet((OperationalLimitSet) _value_);
} else {
throw new IllegalArgumentException("Object is not OperationalLimitSet");
Expand Down
28 changes: 24 additions & 4 deletions CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Accumulator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ protected Accumulator(String cimType, String rdfid) {
*/
private Set<AccumulatorValue> AccumulatorValues = new HashSet<>(); // OneToMany

private Set<String> AccumulatorValuesIdSet = new HashSet<>();

public Set<AccumulatorValue> getAccumulatorValues() {
return AccumulatorValues;
}
Expand All @@ -51,15 +53,23 @@ public void setAccumulatorValues(AccumulatorValue _object_) {
if (!AccumulatorValues.contains(_object_)) {
AccumulatorValues.add(_object_);
_object_.setAccumulator(this);
AccumulatorValuesIdSet.add(_object_.getRdfid());
}
}

private static Object getAccumulatorValues(BaseClass _this_) {
return ((Accumulator) _this_).getAccumulatorValues();
var objs = ((Accumulator) _this_).getAccumulatorValues();
var ids = ((Accumulator) _this_).AccumulatorValuesIdSet;
if (objs.size() < ids.size()) {
return ids;
}
return objs;
}

private static void setAccumulatorValues(BaseClass _this_, Object _value_) {
if (_value_ instanceof AccumulatorValue) {
if (_value_ instanceof String) {
((Accumulator) _this_).AccumulatorValuesIdSet.add((String) _value_);
} else if (_value_ instanceof AccumulatorValue) {
((Accumulator) _this_).setAccumulatorValues((AccumulatorValue) _value_);
} else {
throw new IllegalArgumentException("Object is not AccumulatorValue");
Expand All @@ -73,6 +83,8 @@ private static void setAccumulatorValues(BaseClass _this_, Object _value_) {
*/
private Set<AccumulatorLimitSet> LimitSets = new HashSet<>(); // OneToMany

private Set<String> LimitSetsIdSet = new HashSet<>();

public Set<AccumulatorLimitSet> getLimitSets() {
return LimitSets;
}
Expand All @@ -81,15 +93,23 @@ public void setLimitSets(AccumulatorLimitSet _object_) {
if (!LimitSets.contains(_object_)) {
LimitSets.add(_object_);
_object_.setMeasurements(this);
LimitSetsIdSet.add(_object_.getRdfid());
}
}

private static Object getLimitSets(BaseClass _this_) {
return ((Accumulator) _this_).getLimitSets();
var objs = ((Accumulator) _this_).getLimitSets();
var ids = ((Accumulator) _this_).LimitSetsIdSet;
if (objs.size() < ids.size()) {
return ids;
}
return objs;
}

private static void setLimitSets(BaseClass _this_, Object _value_) {
if (_value_ instanceof AccumulatorLimitSet) {
if (_value_ instanceof String) {
((Accumulator) _this_).LimitSetsIdSet.add((String) _value_);
} else if (_value_ instanceof AccumulatorLimitSet) {
((Accumulator) _this_).setLimitSets((AccumulatorLimitSet) _value_);
} else {
throw new IllegalArgumentException("Object is not AccumulatorLimitSet");
Expand Down
16 changes: 13 additions & 3 deletions CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AccumulatorLimit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,33 @@ protected AccumulatorLimit(String cimType, String rdfid) {
*/
private AccumulatorLimitSet LimitSet; // ManyToOne

private String LimitSetId;

public AccumulatorLimitSet getLimitSet() {
return LimitSet;
}

public void setLimitSet(AccumulatorLimitSet _object_) {
if (LimitSet != _object_) {
LimitSet = _object_;
LimitSet.setLimits(this);
_object_.setLimits(this);
LimitSetId = _object_.getRdfid();
}
}

private static Object getLimitSet(BaseClass _this_) {
return ((AccumulatorLimit) _this_).getLimitSet();
var obj = ((AccumulatorLimit) _this_).getLimitSet();
var id = ((AccumulatorLimit) _this_).LimitSetId;
if (obj == null && id != null) {
return id;
}
return obj;
}

private static void setLimitSet(BaseClass _this_, Object _value_) {
if (_value_ instanceof AccumulatorLimitSet) {
if (_value_ instanceof String) {
((AccumulatorLimit) _this_).LimitSetId = (String) _value_;
} else if (_value_ instanceof AccumulatorLimitSet) {
((AccumulatorLimit) _this_).setLimitSet((AccumulatorLimitSet) _value_);
} else {
throw new IllegalArgumentException("Object is not AccumulatorLimitSet");
Expand Down
28 changes: 24 additions & 4 deletions CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AccumulatorLimitSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ protected AccumulatorLimitSet(String cimType, String rdfid) {
*/
private Set<AccumulatorLimit> Limits = new HashSet<>(); // OneToMany

private Set<String> LimitsIdSet = new HashSet<>();

public Set<AccumulatorLimit> getLimits() {
return Limits;
}
Expand All @@ -51,15 +53,23 @@ public void setLimits(AccumulatorLimit _object_) {
if (!Limits.contains(_object_)) {
Limits.add(_object_);
_object_.setLimitSet(this);
LimitsIdSet.add(_object_.getRdfid());
}
}

private static Object getLimits(BaseClass _this_) {
return ((AccumulatorLimitSet) _this_).getLimits();
var objs = ((AccumulatorLimitSet) _this_).getLimits();
var ids = ((AccumulatorLimitSet) _this_).LimitsIdSet;
if (objs.size() < ids.size()) {
return ids;
}
return objs;
}

private static void setLimits(BaseClass _this_, Object _value_) {
if (_value_ instanceof AccumulatorLimit) {
if (_value_ instanceof String) {
((AccumulatorLimitSet) _this_).LimitsIdSet.add((String) _value_);
} else if (_value_ instanceof AccumulatorLimit) {
((AccumulatorLimitSet) _this_).setLimits((AccumulatorLimit) _value_);
} else {
throw new IllegalArgumentException("Object is not AccumulatorLimit");
Expand All @@ -71,6 +81,8 @@ private static void setLimits(BaseClass _this_, Object _value_) {
*/
private Set<Accumulator> Measurements = new HashSet<>(); // OneToMany

private Set<String> MeasurementsIdSet = new HashSet<>();

public Set<Accumulator> getMeasurements() {
return Measurements;
}
Expand All @@ -79,15 +91,23 @@ public void setMeasurements(Accumulator _object_) {
if (!Measurements.contains(_object_)) {
Measurements.add(_object_);
_object_.setLimitSets(this);
MeasurementsIdSet.add(_object_.getRdfid());
}
}

private static Object getMeasurements(BaseClass _this_) {
return ((AccumulatorLimitSet) _this_).getMeasurements();
var objs = ((AccumulatorLimitSet) _this_).getMeasurements();
var ids = ((AccumulatorLimitSet) _this_).MeasurementsIdSet;
if (objs.size() < ids.size()) {
return ids;
}
return objs;
}

private static void setMeasurements(BaseClass _this_, Object _value_) {
if (_value_ instanceof Accumulator) {
if (_value_ instanceof String) {
((AccumulatorLimitSet) _this_).MeasurementsIdSet.add((String) _value_);
} else if (_value_ instanceof Accumulator) {
((AccumulatorLimitSet) _this_).setMeasurements((Accumulator) _value_);
} else {
throw new IllegalArgumentException("Object is not Accumulator");
Expand Down
Loading