diff --git a/pom.xml b/pom.xml index 9b0bb68..21a82d5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.2 + 3.4.13 org.ccalm diff --git a/src/main/java/org/ccalm/weather/AirTemperature.java b/src/main/java/org/ccalm/weather/AirTemperature.java index 80a3402..598d5de 100644 --- a/src/main/java/org/ccalm/weather/AirTemperature.java +++ b/src/main/java/org/ccalm/weather/AirTemperature.java @@ -116,7 +116,7 @@ public class AirTemperature implements ServletContextAware { //Example request: http://ccalm.org/AirTemperature?date=20210531 //Example request: http://127.0.0.1:8080/AirTemperature?date=20210531 - if(date==null || date.equals("")) + if(date==null || date.isEmpty())) { //Если день не задан то ищем максимальный день не старше 10 дней и прибавляем 1 день String sql="select to_char(max(date)+'1 days'::interval, 'YYYYMMDD') from main.air_temperature_dates where hours=0 and date > now() - '10 days'::interval"; @@ -132,7 +132,7 @@ public class AirTemperature implements ServletContextAware { } } } - if(date==null || date.equals("")) + if(date==null || date.isEmpty()) { DateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); date=dateFormat.format(new Date()); //Date like as "20170327". @@ -191,7 +191,7 @@ public class AirTemperature implements ServletContextAware { StringBuffer answer2=new StringBuffer(strPos2); Tools.CutBeforeFirst(answer2,":"); String posEnd = Tools.CutBeforeFirst(answer2,":"); - if(posEnd==null || posEnd.equals("")) posEnd=""; else + if(posEnd==null || posEnd.isEmpty()) posEnd=""; else { posEnd=String.valueOf(Long.parseLong(posEnd)-1); } diff --git a/src/main/java/org/ccalm/weather/SoilTmperature.java b/src/main/java/org/ccalm/weather/SoilTmperature.java index 7fedfca..caa98ec 100644 --- a/src/main/java/org/ccalm/weather/SoilTmperature.java +++ b/src/main/java/org/ccalm/weather/SoilTmperature.java @@ -136,7 +136,7 @@ public class SoilTmperature implements ServletContextAware { } catch (SQLException ex) { logger.error("N3:"+ex.getMessage(),ex); } - if(date==null || date.equals("")) + if(date==null || date.isEmpty()) { //Если день не задан то ищем максимальный день не старше 10 дней и прибавляем 1 день String sql="select to_char(max(date)+'1 days'::interval, 'YYYYMMDD') from main.soil_temperature_dates where hours=0 and date > now() - '10 days'::interval"; @@ -152,7 +152,7 @@ public class SoilTmperature implements ServletContextAware { } } } - if(date==null || date.equals("")) + if(date==null || date.isEmpty()) { DateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); date=dateFormat.format(new Date()); //Date like as "20170327". @@ -216,7 +216,7 @@ public class SoilTmperature implements ServletContextAware { StringBuffer answer2=new StringBuffer(strPos2); Tools.CutBeforeFirst(answer2,":"); String posEnd = Tools.CutBeforeFirst(answer2,":"); - if(posEnd==null || posEnd.equals("")) posEnd=""; else + if(posEnd==null || posEnd.isEmpty()) posEnd=""; else { posEnd=String.valueOf(Long.parseLong(posEnd)-1); }