Add separate QueryIgnore annotation (fix #2962)

2 files changed, 6 insertions, 0 deletions

diff --git a/src/org/traccar/model/Calendar.java b/src/org/traccar/model/Calendar.java
index 94f6bc2a3..55f696d50 100644
--- a/src/org/traccar/model/Calendar.java
+++ b/src/org/traccar/model/Calendar.java
@@ -32,6 +32,7 @@ import net.fortuna.ical4j.model.DateTime;
 import net.fortuna.ical4j.model.Dur;
 import net.fortuna.ical4j.model.Period;
 import net.fortuna.ical4j.model.component.CalendarComponent;
+import org.traccar.database.QueryIgnore;
 
 public class Calendar extends Extensible {
 
@@ -59,6 +60,7 @@ public class Calendar extends Extensible {
 
     private net.fortuna.ical4j.model.Calendar calendar;
 
+    @QueryIgnore
     @JsonIgnore
     public net.fortuna.ical4j.model.Calendar getCalendar() {
         return calendar;
@@ -76,4 +78,5 @@ public class Calendar extends Extensible {
         }
         return false;
     }
+
 }
diff --git a/src/org/traccar/model/Geofence.java b/src/org/traccar/model/Geofence.java
index ffd4876bf..dfb888852 100644
--- a/src/org/traccar/model/Geofence.java
+++ b/src/org/traccar/model/Geofence.java
@@ -18,6 +18,7 @@ package org.traccar.model;
 import java.text.ParseException;
 
 import org.traccar.Context;
+import org.traccar.database.QueryIgnore;
 import org.traccar.geofence.GeofenceCircle;
 import org.traccar.geofence.GeofenceGeometry;
 import org.traccar.geofence.GeofencePolygon;
@@ -74,11 +75,13 @@ public class Geofence extends Extensible {
 
     private GeofenceGeometry geometry;
 
+    @QueryIgnore
     @JsonIgnore
     public GeofenceGeometry getGeometry() {
         return geometry;
     }
 
+    @QueryIgnore
     @JsonIgnore
     public void setGeometry(GeofenceGeometry geometry) {
         area = geometry.toWkt();