Add more auto formatted message for missing parameter

qgis · Mar 28, 2019 · bdda371 · bdda371
1 parent cac591c
commit bdda371
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/server/services/wms/qgswmsgetstyles.cpp b/src/server/services/wms/qgswmsgetstyles.cpp
@@ -59,15 +59,15 @@ namespace QgsWms
 
     if ( layersName.isEmpty() )
     {
-      throw QgsBadRequestException( QStringLiteral( "LayerNotSpecified" ),
-                                    QStringLiteral( "Layers is mandatory for GetStyles operation" ) );
+      throw QgsBadRequestException( QgsServiceException::QGIS_MISSING_PARAMETER_VALUE,
+                                    QgsWmsParameter::LAYERS );
     }
 
     QStringList layerList = layersName.split( ',', QString::SkipEmptyParts );
     if ( layerList.isEmpty() )
     {
-      throw QgsBadRequestException( QStringLiteral( "LayerNotSpecified" ),
-                                    QStringLiteral( "Layers is mandatory for GetStyles operation" ) );
+      throw QgsBadRequestException( QgsServiceException::QGIS_MISSING_PARAMETER_VALUE,
+                                    QgsWmsParameter::LAYERS );
     }
 
     return getStyledLayerDescriptorDocument( serverIface, project, layerList );
@@ -96,14 +96,14 @@ namespace QgsWms
 
     if ( styleName.isEmpty() )
     {
-      throw QgsServiceException( QStringLiteral( "StyleNotSpecified" ),
-                                 QStringLiteral( "Style is mandatory for GetStyle operation" ), 400 );
+      throw QgsBadRequestException( QgsServiceException::QGIS_MISSING_PARAMETER_VALUE,
+                                    QgsWmsParameter::STYLE );
     }
 
     if ( layerName.isEmpty() )
     {
-      throw QgsServiceException( QStringLiteral( "LayerNotSpecified" ),
-                                 QStringLiteral( "Layer is mandatory for GetStyle operation" ), 400 );
+      throw QgsBadRequestException( QgsServiceException::QGIS_MISSING_PARAMETER_VALUE,
+                                    QgsWmsParameter::LAYERS );
     }
 
     QStringList layerList;

diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -132,7 +132,7 @@ namespace QgsWms
     // check parameters
     if ( mWmsParameters.allLayersNickname().isEmpty() )
       throw QgsBadRequestException( QgsServiceException::QGIS_MISSING_PARAMETER_VALUE,
-                                    QgsWmsParameter::LAYER );
+                                    QgsWmsParameter::LAYERS );
 
     if ( mWmsParameters.format() == QgsWmsParameters::Format::NONE )
       throw QgsBadRequestException( QgsServiceException::QGIS_MISSING_PARAMETER_VALUE,