[extra-standard] r1952 committed - Aktueller Entwicklungsstand mit Validierung der Eingangsbean

[extra-s...@googlecode.com]

Revision: 1952
Author: florianstratil
Date: Tue Nov 11 10:22:36 2014 UTC
Log: Aktueller Entwicklungsstand mit Validierung der Eingangsbean
https://code.google.com/p/extra-standard/source/detail?r=1952

Added:

/trunk/java/apps/extraClientLight/src/main/java/de/extra/extraClientLight/util/RequestBeanValidator.java
Modified:
/trunk/java/apps/extraClientLight/pom.xml

/trunk/java/apps/extraClientLight/src/main/java/de/extra/extraClientLight/impl/ExtraClientImpl.java

/trunk/java/apps/extraClientLight/src/main/java/de/extra/extraClientLight/model/ResponseExtraBean.java

/trunk/java/apps/extraClientLight/src/main/java/de/extra/extraClientLight/util/SendWebService.java

=======================================
--- /dev/null
+++
/trunk/java/apps/extraClientLight/src/main/java/de/extra/extraClientLight/util/RequestBeanValidator.java
Tue Nov 11 10:22:36 2014 UTC
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package de.extra.extraClientLight.util;
+
+import de.extra.extraClientLight.model.RequestExtraBean;
+
+public class RequestBeanValidator {
+
+ public static boolean validateRequestBean(RequestExtraBean requestBean) {
+
+ boolean isValid = true;
+
+ // Pruefe Verfahren, Fachdienst, URL und Profile
+ if (!checkUrl(requestBean.getVerfahren())) {
+ return false;
+ }
+ if (!checkUrl(requestBean.getFachdienst())) {
+ return false;
+ }
+ if (!checkUrl(requestBean.getUrl())) {
+ return false;
+ }
+ if (!checkUrl(requestBean.getProfile())) {
+ return false;
+ }
+
+ // Pruefe Absender und Empfaenger
+
+ if (!checkAdress(requestBean.getAbsender())) {
+
+ return false;
+ }
+ if (!checkAdress(requestBean.getEmpfaenger())) {
+
+ return false;
+ }
+
+ return isValid;
+ }
+
+ private static boolean checkUrl(String url) {
+ boolean isValid = true;
+ if (url != null) {
+ if (!url.startsWith("http")) {
+ isValid = false;
+ }
+ } else {
+
+ isValid = false;
+ }
+ return isValid;
+ }
+
+ private static boolean checkAdress(String adress) {
+ boolean isValid = true;
+ if (adress != null) {
+ if (adress.isEmpty()) {
+ return false;
+ }
+
+ } else {
+ return false;
+ }
+
+ return isValid;
+ }
+
+}
=======================================
--- /trunk/java/apps/extraClientLight/pom.xml Wed Nov 5 08:44:11 2014 UTC
+++ /trunk/java/apps/extraClientLight/pom.xml Tue Nov 11 10:22:36 2014 UTC
@@ -33,41 +33,6 @@
<version>1.3.2</version>
</dependency>
</dependencies>
- <!-- 2014-11-03 FS Deaktiviert bis Weg gefunden mit Annox zu nutzen
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
- <version>3.0.1</version>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
-
<sourceRoot>${project.build.directory}/generated/extraWs</sourceRoot>
- <wsdlOptions>
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/extra_mtom.wsdl</wsdl>
- </wsdlOption>
- </wsdlOptions>
- </configuration>
- <goals>
- <goal>wsdl2java</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
--->
+

</project>
=======================================
---
/trunk/java/apps/extraClientLight/src/main/java/de/extra/extraClientLight/impl/ExtraClientImpl.java
Fri Nov 7 11:31:42 2014 UTC
+++
/trunk/java/apps/extraClientLight/src/main/java/de/extra/extraClientLight/impl/ExtraClientImpl.java
Tue Nov 11 10:22:36 2014 UTC
@@ -30,6 +30,7 @@
import de.extra.extraClientLight.helper.ExtraResponseHelper;
import de.extra.extraClientLight.model.RequestExtraBean;
import de.extra.extraClientLight.model.ResponseExtraBean;
+import de.extra.extraClientLight.util.RequestBeanValidator;
import de.extra.extraClientLight.util.SendWebService;


@@ -38,8 +39,15 @@

public ResponseExtraBean sendExtra(RequestExtraBean requestExtra) {
LOGGER.info("Client aufgerufen");
- ResponseExtraBean responseBean;
+ ResponseExtraBean responseBean = new ResponseExtraBean();
+ int returnCode = 99;

+ if(!RequestBeanValidator.validateRequestBean(requestExtra)){
+
+ returnCode = 1;
+
+ }else{
+
SendWebService sendWebService = new SendWebService();
TransportRequestType extraRequest = BuildExtraTransport
.buildTransportRequest(requestExtra);
@@ -49,6 +57,8 @@
TransportResponseType extraResponse =
sendWebService.sendRequest(extraRequest, requestExtra.getUrl(),
requestExtra.isMtom());
responseBean = ExtraResponseHelper.convertExtraResponse(extraResponse);
+ }
+ responseBean.setReturnCode(returnCode);

return responseBean;
}
=======================================
---
/trunk/java/apps/extraClientLight/src/main/java/de/extra/extraClientLight/model/ResponseExtraBean.java
Fri Oct 17 06:38:41 2014 UTC
+++
/trunk/java/apps/extraClientLight/src/main/java/de/extra/extraClientLight/model/ResponseExtraBean.java
Tue Nov 11 10:22:36 2014 UTC
@@ -24,7 +24,7 @@
public class ResponseExtraBean {

private int returnCode;
- private String requestId;
+ private String fachschluessel;
private byte[] data;
private String responseId;
private ReportLevelEnum reportLevel;
@@ -37,10 +37,10 @@
this.returnCode = returnCode;
}
public String getRequestId() {
- return requestId;
+ return fachschluessel;
}
public void setRequestId(String requestId) {
- this.requestId = requestId;
+ this.fachschluessel = requestId;
}
public byte[] getData() {
return data;
=======================================
---
/trunk/java/apps/extraClientLight/src/main/java/de/extra/extraClientLight/util/SendWebService.java
Fri Nov 7 11:31:42 2014 UTC
+++
/trunk/java/apps/extraClientLight/src/main/java/de/extra/extraClientLight/util/SendWebService.java
Tue Nov 11 10:22:36 2014 UTC
@@ -41,7 +41,13 @@

private static final QName SERVICE_NAME = new QName(
"https://www.eservicet-drv.de/SPoC", "execute");
-
+/**
+ *
+ * @param extraRequest
+ * @param url
+ * @param mtomActive
+ * @return
+ */
public TransportResponseType sendRequest(TransportRequestType
extraRequest,
String url, boolean mtomActive) {
TransportResponseType response = new TransportResponseType();