| @@ -16,19 +16,14 @@ |
| import javax.ws.rs.Path; |
| import csip.ModelDataService; |
| import csip.ServiceException; |
| -import csip.SessionLogger; |
| import csip.annotations.*; |
| import java.io.FileNotFoundException; |
| import java.io.IOException; |
| import java.text.ParseException; |
| import java.text.SimpleDateFormat; |
| -import java.time.LocalDate; |
| -import java.time.ZoneId; |
| import java.util.ArrayList; |
| import java.util.Arrays; |
| -import java.util.Calendar; |
| import java.util.Date; |
| -import java.util.GregorianCalendar; |
| import java.util.List; |
| import java.util.TimeZone; |
| import org.bson.Document; |
| @@ -37,9 +32,6 @@ |
| import org.codehaus.jettison.json.JSONArray; |
| import org.codehaus.jettison.json.JSONException; |
| import org.codehaus.jettison.json.JSONObject; |
| -import java.util.logging.Level; |
| -import java.util.logging.Logger; |
| -import org.apache.catalina.ant.ServerinfoTask; |
| |
| /** |
| * Mongodb timeseries data insertion |
| @@ -104,13 +96,15 @@ |
| |
| SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd"); |
| ft.setTimeZone(TimeZone.getTimeZone("UTC")); |
| - Date start_date; |
| - Date end_date; |
| - try { |
| - start_date = ft.parse(start_date_str); |
| - end_date = ft.parse(end_date_str); |
| - } catch (ParseException ex) { |
| - throw new ServiceException(ex); |
| + Date start_date = null; |
| + Date end_date = null; |
| + if (start_date_str != null) { |
| + try { |
| + start_date = ft.parse(start_date_str); |
| + end_date = ft.parse(end_date_str); |
| + } catch (ParseException ex) { |
| + throw new ServiceException(ex); |
| + } |
| } |
| |
| if (search_feature == null) { |