Using simple APIs

Author: phax

phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/api/Phase4API.java

@@ -19,6 +19,7 @@
 import javax.annotation.Nonnull;
 
 import com.helger.peppol.servicedomain.EPeppolNetwork;
+import com.helger.phase4.peppol.server.APConfig;
 import com.helger.photon.api.APIDescriptor;
 import com.helger.photon.api.APIPath;
 import com.helger.photon.api.IAPIExceptionMapper;
@@ -44,8 +45,10 @@ public static void init (@Nonnull final IAPIRegistry aAPIRegistry)
   {
     final IAPIExceptionMapper aExceptionMapper = new APIExceptionMapper ();
 
+    final EPeppolNetwork eStage = APConfig.getPeppolStage ();
+
     {
-      final APIDescriptor aSendTest = new APIDescriptor (APIPath.post ("/sendtest/{" +
+      final APIDescriptor aSendTest = new APIDescriptor (APIPath.post ("/sendas4/{" +
                                                                        PARAM_SENDER_ID +
                                                                        "}/{" +
                                                                        PARAM_RECEIVER_ID +
@@ -55,30 +58,12 @@ public static void init (@Nonnull final IAPIRegistry aAPIRegistry)
                                                                        PARAM_PROCESS_ID +
                                                                        "}/{" +
                                                                        PARAM_COUNTRY_CODE_C1 +
-                                                                       "}"),
-                                                         new APIPostSendDocument (EPeppolNetwork.TEST));
+                                                                       "}"), new APIPostSendDocument (eStage));
       aSendTest.setExceptionMapper (aExceptionMapper);
       aAPIRegistry.registerAPI (aSendTest);
     }
     {
-      final APIDescriptor aSendProd = new APIDescriptor (APIPath.post ("/sendprod/{" +
-                                                                       PARAM_SENDER_ID +
-                                                                       "}/{" +
-                                                                       PARAM_RECEIVER_ID +
-                                                                       "}/{" +
-                                                                       PARAM_DOC_TYPE_ID +
-                                                                       "}/{" +
-                                                                       PARAM_PROCESS_ID +
-                                                                       "}/{" +
-                                                                       PARAM_COUNTRY_CODE_C1 +
-                                                                       "}"),
-                                                         new APIPostSendDocument (EPeppolNetwork.PRODUCTION));
-      aSendProd.setExceptionMapper (aExceptionMapper);
-      aAPIRegistry.registerAPI (aSendProd);
-    }
-    {
-      final APIDescriptor aSendTestSbdh = new APIDescriptor (APIPath.post ("/sendtestsbdh"),
-                                                             new APIPostSendDocument (EPeppolNetwork.TEST));
+      final APIDescriptor aSendTestSbdh = new APIDescriptor (APIPath.post ("/sendsbdh"), new APIPostSendSBDH (eStage));
       aSendTestSbdh.setExceptionMapper (aExceptionMapper);
       aAPIRegistry.registerAPI (aSendTestSbdh);
     }

phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/servlet/Phase4PeppolWebAppListener.java

@@ -141,8 +141,8 @@ protected void initGlobalSettings ()
     HttpDebugger.setEnabled (false);
 
     // Sanity check
-    if (CommandMap.getDefaultCommandMap ()
-                  .createDataContentHandler (CMimeType.MULTIPART_RELATED.getAsString ()) == null)
+    if (CommandMap.getDefaultCommandMap ().createDataContentHandler (CMimeType.MULTIPART_RELATED.getAsString ()) ==
+        null)
       throw new IllegalStateException ("No DataContentHandler for MIME Type '" +
                                        CMimeType.MULTIPART_RELATED.getAsString () +
                                        "' is available. There seems to be a problem with the dependencies/packaging");
@@ -190,20 +190,18 @@ public void onEndRequest (@Nonnull final IAS4IncomingMessageMetadata aMessageMet
         if (SimpleFileIO.writeFile (aFile,
                                     AS4IncomingHelper.getIncomingMetadataAsJson (aMessageMetadata)
                                                      .getAsJsonString (JsonWriterSettings.DEFAULT_SETTINGS_FORMATTED),
-                                    StandardCharsets.UTF_8)
-                        .isFailure ())
+                                    StandardCharsets.UTF_8).isFailure ())
           LOGGER.error ("Failed to write metadata to '" + aFile.getAbsolutePath () + "'");
         else
           LOGGER.info ("Wrote metadata to '" + aFile.getAbsolutePath () + "'");
       }
     });
 
     // Store the outgoings file as well
-    AS4DumpManager.setOutgoingDumper (new AS4OutgoingDumperFileBased ( (eMsgMode,
-                                                                        sMessageID,
-                                                                        nTry) -> StorageHelper.getStorageFile (sMessageID,
-                                                                                                               nTry,
-                                                                                                               ".as4out")));
+    AS4DumpManager.setOutgoingDumper (new AS4OutgoingDumperFileBased ( (eMsgMode, sMessageID, nTry) -> StorageHelper
+                                                                                                                    .getStorageFile (sMessageID,
+                                                                                                                                     nTry,
+                                                                                                                                     ".as4out")));
   }
 
   private static void _initPeppolAS4 ()
@@ -309,7 +307,7 @@ private static void _initPeppolAS4 ()
       LOGGER.error ("Failed to do a reverse search of the certificate", ex);
     }
 
-    // TODO separate to test and production
+    // Seeparate to test and production
     final EPeppolNetwork eStage = APConfig.getPeppolStage ();
     final PeppolCAChecker aAPCAChecker = eStage.isTest () ? PeppolCertificateChecker.peppolTestAP ()
                                                           : PeppolCertificateChecker.peppolProductionAP ();