Updated to changed peppol-directory-businesscard module

phax · Nov 13, 2023 · 653c01b · 653c01b
1 parent fff9672
commit 653c01b
Show file tree

Hide file tree

Showing 14 changed files with 77 additions and 69 deletions.
diff --git a/phoss-smp-backend/pom.xml b/phoss-smp-backend/pom.xml
@@ -24,17 +24,20 @@
   <description>SMP backend library with all common parts used for a full SMP server web application</description>
   <url>https://github.com/phax/phoss-smp/phoss-smp-backend</url>
   <inceptionYear>2015</inceptionYear>
+
   <licenses>
     <license>
       <name>MPL 2.0</name>
       <url>http://mozilla.org/MPL/2.0/</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
+
   <organization>
     <name>Philip Helger</name>
     <url>http://www.helger.com</url>
   </organization>
+
   <developers>
     <developer>
       <id>philip</id>
@@ -43,6 +46,7 @@
       <url>http://www.helger.com</url>
     </developer>
   </developers>
+
   <dependencies>
     <dependency>
       <groupId>com.helger.commons</groupId>
@@ -77,18 +81,20 @@
       <artifactId>ph-oton-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.helger</groupId>
-      <artifactId>phoss-directory-businesscard</artifactId>
+      <groupId>com.helger.peppol</groupId>
+      <artifactId>peppol-directory-businesscard</artifactId>
     </dependency>
     <dependency>
       <groupId>com.helger</groupId>
       <artifactId>ph-xmldsig</artifactId>
     </dependency>
+
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -99,6 +105,7 @@
       <artifactId>ph-oton-security</artifactId>
       <optional>true</optional>
     </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
@@ -110,6 +117,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
   <build>
     <resources>
       <!-- Hack to filter only properties files -->

diff --git a/...-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/ISMPBusinessCard.java b/...-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/ISMPBusinessCard.java
@@ -20,7 +20,7 @@
 import com.helger.commons.annotation.ReturnsMutableCopy;
 import com.helger.commons.collection.impl.ICommonsList;
 import com.helger.commons.id.IHasID;
-import com.helger.pd.businesscard.v3.PD3BusinessCardType;
+import com.helger.peppol.businesscard.v3.PD3BusinessCardType;
 import com.helger.peppolid.IParticipantIdentifier;
 
 /**

diff --git a/...s-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCard.java b/...s-smp-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCard.java
@@ -24,8 +24,8 @@
 import com.helger.commons.hashcode.HashCodeGenerator;
 import com.helger.commons.string.ToStringGenerator;
 import com.helger.commons.type.ObjectType;
-import com.helger.pd.businesscard.v3.PD3APIHelper;
-import com.helger.pd.businesscard.v3.PD3BusinessCardType;
+import com.helger.peppol.businesscard.v3.PD3APIHelper;
+import com.helger.peppol.businesscard.v3.PD3BusinessCardType;
 import com.helger.peppolid.IParticipantIdentifier;
 import com.helger.phoss.smp.domain.servicegroup.SMPServiceGroup;
 

diff --git a/...ackend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardContact.java b/...ackend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardContact.java
@@ -24,8 +24,8 @@
 import com.helger.commons.id.factory.GlobalIDFactory;
 import com.helger.commons.string.StringHelper;
 import com.helger.commons.string.ToStringGenerator;
-import com.helger.pd.businesscard.generic.PDContact;
-import com.helger.pd.businesscard.v3.PD3ContactType;
+import com.helger.peppol.businesscard.generic.PDContact;
+import com.helger.peppol.businesscard.v3.PD3ContactType;
 
 /**
  * A single business card contact.

diff --git a/...backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardEntity.java b/...backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardEntity.java
@@ -31,11 +31,11 @@
 import com.helger.commons.string.ToStringGenerator;
 import com.helger.json.IJsonArray;
 import com.helger.json.JsonArray;
-import com.helger.pd.businesscard.generic.PDBusinessEntity;
-import com.helger.pd.businesscard.generic.PDContact;
-import com.helger.pd.businesscard.generic.PDIdentifier;
-import com.helger.pd.businesscard.generic.PDName;
-import com.helger.pd.businesscard.v3.PD3BusinessEntityType;
+import com.helger.peppol.businesscard.generic.PDBusinessEntity;
+import com.helger.peppol.businesscard.generic.PDContact;
+import com.helger.peppol.businesscard.generic.PDIdentifier;
+import com.helger.peppol.businesscard.generic.PDName;
+import com.helger.peppol.businesscard.v3.PD3BusinessEntityType;
 
 /**
  * This class represents a single Business Card entity - a part of a Business

diff --git a/...end/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardIdentifier.java b/...end/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardIdentifier.java
@@ -22,9 +22,9 @@
 import com.helger.commons.id.IHasID;
 import com.helger.commons.id.factory.GlobalIDFactory;
 import com.helger.commons.string.ToStringGenerator;
-import com.helger.pd.businesscard.generic.PDIdentifier;
-import com.helger.pd.businesscard.v3.PD3APIHelper;
-import com.helger.pd.businesscard.v3.PD3IdentifierType;
+import com.helger.peppol.businesscard.generic.PDIdentifier;
+import com.helger.peppol.businesscard.v3.PD3APIHelper;
+import com.helger.peppol.businesscard.v3.PD3IdentifierType;
 
 /**
  * A single business card identifier.

diff --git a/...p-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardName.java b/...p-backend/src/main/java/com/helger/phoss/smp/domain/businesscard/SMPBusinessCardName.java
@@ -25,9 +25,9 @@
 import com.helger.commons.string.ToStringGenerator;
 import com.helger.json.IJsonObject;
 import com.helger.json.JsonObject;
-import com.helger.pd.businesscard.generic.PDName;
-import com.helger.pd.businesscard.v3.PD3APIHelper;
-import com.helger.pd.businesscard.v3.PD3MultilingualNameType;
+import com.helger.peppol.businesscard.generic.PDName;
+import com.helger.peppol.businesscard.v3.PD3APIHelper;
+import com.helger.peppol.businesscard.v3.PD3MultilingualNameType;
 
 /**
  * Generic name.

diff --git a/phoss-smp-backend/src/main/java/com/helger/phoss/smp/restapi/BusinessCardServerAPI.java b/phoss-smp-backend/src/main/java/com/helger/phoss/smp/restapi/BusinessCardServerAPI.java
@@ -22,9 +22,9 @@
 import com.helger.commons.statistics.IMutableStatisticsHandlerKeyedCounter;
 import com.helger.commons.statistics.IStatisticsHandlerKeyedCounter;
 import com.helger.commons.statistics.StatisticsManager;
-import com.helger.pd.businesscard.generic.PDBusinessCard;
-import com.helger.pd.businesscard.generic.PDBusinessEntity;
-import com.helger.pd.businesscard.v3.PD3BusinessCardType;
+import com.helger.peppol.businesscard.generic.PDBusinessCard;
+import com.helger.peppol.businesscard.generic.PDBusinessEntity;
+import com.helger.peppol.businesscard.v3.PD3BusinessCardType;
 import com.helger.peppolid.IParticipantIdentifier;
 import com.helger.peppolid.factory.IIdentifierFactory;
 import com.helger.phoss.smp.domain.SMPMetaManager;

diff --git a/phoss-smp-webapp-xml/src/test/java/com/helger/phoss/smp/rest/BusinessCardInterfaceTest.java b/phoss-smp-webapp-xml/src/test/java/com/helger/phoss/smp/rest/BusinessCardInterfaceTest.java
@@ -38,15 +38,15 @@
 import com.helger.commons.io.resource.FileSystemResource;
 import com.helger.commons.string.StringHelper;
 import com.helger.http.basicauth.BasicAuthClientCredentials;
-import com.helger.pd.businesscard.v1.PD1APIHelper;
-import com.helger.pd.businesscard.v1.PD1BusinessCardType;
-import com.helger.pd.businesscard.v1.PD1BusinessEntityType;
-import com.helger.pd.businesscard.v2.PD2APIHelper;
-import com.helger.pd.businesscard.v2.PD2BusinessCardType;
-import com.helger.pd.businesscard.v2.PD2BusinessEntityType;
-import com.helger.pd.businesscard.v3.PD3APIHelper;
-import com.helger.pd.businesscard.v3.PD3BusinessCardType;
-import com.helger.pd.businesscard.v3.PD3BusinessEntityType;
+import com.helger.peppol.businesscard.v1.PD1APIHelper;
+import com.helger.peppol.businesscard.v1.PD1BusinessCardType;
+import com.helger.peppol.businesscard.v1.PD1BusinessEntityType;
+import com.helger.peppol.businesscard.v2.PD2APIHelper;
+import com.helger.peppol.businesscard.v2.PD2BusinessCardType;
+import com.helger.peppol.businesscard.v2.PD2BusinessEntityType;
+import com.helger.peppol.businesscard.v3.PD3APIHelper;
+import com.helger.peppol.businesscard.v3.PD3BusinessCardType;
+import com.helger.peppol.businesscard.v3.PD3BusinessEntityType;
 import com.helger.peppolid.IParticipantIdentifier;
 import com.helger.peppolid.factory.PeppolIdentifierFactory;
 import com.helger.peppolid.simple.participant.SimpleParticipantIdentifier;
@@ -81,9 +81,9 @@ public final class BusinessCardInterfaceTest
   public final SMPServerRESTTestRule m_aRule = new SMPServerRESTTestRule (new FileSystemResource ("src/test/resources/test-smp-server-xml-peppol.properties"));
 
   private final ObjectFactory m_aObjFactory = new ObjectFactory ();
-  private final com.helger.pd.businesscard.v1.ObjectFactory m_aBC1ObjFactory = new com.helger.pd.businesscard.v1.ObjectFactory ();
-  private final com.helger.pd.businesscard.v2.ObjectFactory m_aBC2ObjFactory = new com.helger.pd.businesscard.v2.ObjectFactory ();
-  private final com.helger.pd.businesscard.v3.ObjectFactory m_aBC3ObjFactory = new com.helger.pd.businesscard.v3.ObjectFactory ();
+  private final com.helger.peppol.businesscard.v1.ObjectFactory m_aBC1ObjFactory = new com.helger.peppol.businesscard.v1.ObjectFactory ();
+  private final com.helger.peppol.businesscard.v2.ObjectFactory m_aBC2ObjFactory = new com.helger.peppol.businesscard.v2.ObjectFactory ();
+  private final com.helger.peppol.businesscard.v3.ObjectFactory m_aBC3ObjFactory = new com.helger.peppol.businesscard.v3.ObjectFactory ();
 
   @Nonnull
   private static Builder _addCredentials (@Nonnull final Builder aBuilder)
@@ -129,8 +129,8 @@ public void testGetCreateV1GetDeleteGet ()
     try
     {
       // Create SG
-      aResponseMsg = _addCredentials (aTarget.path (sPI)
-                                             .request ()).put (Entity.xml (m_aObjFactory.createServiceGroup (aSG)));
+      aResponseMsg = _addCredentials (aTarget.path (sPI).request ()).put (Entity.xml (m_aObjFactory.createServiceGroup (
+                                                                                                                        aSG)));
       _testResponseJerseyClient (aResponseMsg, 200);
 
       // Get SG - must work
@@ -155,9 +155,8 @@ public void testGetCreateV1GetDeleteGet ()
       aBE.setGeographicalInformation ("Berlin");
       aBC.addBusinessEntity (aBE);
 
-      aResponseMsg = _addCredentials (aTarget.path ("businesscard")
-                                             .path (sPI)
-                                             .request ()).put (Entity.xml (m_aBC1ObjFactory.createBusinessCard (aBC)));
+      aResponseMsg = _addCredentials (aTarget.path ("businesscard").path (sPI).request ()).put (Entity.xml (
+                                                                                                            m_aBC1ObjFactory.createBusinessCard (aBC)));
       _testResponseJerseyClient (aResponseMsg, 200);
 
       // Get BC - must work (always V3)
@@ -174,9 +173,8 @@ public void testGetCreateV1GetDeleteGet ()
       aBE.setCountryCode ("SE");
       aBE.setGeographicalInformation ("Stockholm");
       aBC.addBusinessEntity (aBE);
-      aResponseMsg = _addCredentials (aTarget.path ("businesscard")
-                                             .path (sPI)
-                                             .request ()).put (Entity.xml (m_aBC1ObjFactory.createBusinessCard (aBC)));
+      aResponseMsg = _addCredentials (aTarget.path ("businesscard").path (sPI).request ()).put (Entity.xml (
+                                                                                                            m_aBC1ObjFactory.createBusinessCard (aBC)));
       _testResponseJerseyClient (aResponseMsg, 200);
 
       // Get BC - must work (always V3)
@@ -228,8 +226,8 @@ public void testGetCreateV2GetDeleteGet ()
     try
     {
       // Create SG
-      aResponseMsg = _addCredentials (aTarget.path (sPI)
-                                             .request ()).put (Entity.xml (m_aObjFactory.createServiceGroup (aSG)));
+      aResponseMsg = _addCredentials (aTarget.path (sPI).request ()).put (Entity.xml (m_aObjFactory.createServiceGroup (
+                                                                                                                        aSG)));
       _testResponseJerseyClient (aResponseMsg, 200);
 
       // Get SG - must work
@@ -254,9 +252,8 @@ public void testGetCreateV2GetDeleteGet ()
       aBE.setGeographicalInformation ("Berlin");
       aBC.addBusinessEntity (aBE);
 
-      aResponseMsg = _addCredentials (aTarget.path ("businesscard")
-                                             .path (sPI)
-                                             .request ()).put (Entity.xml (m_aBC2ObjFactory.createBusinessCard (aBC)));
+      aResponseMsg = _addCredentials (aTarget.path ("businesscard").path (sPI).request ()).put (Entity.xml (
+                                                                                                            m_aBC2ObjFactory.createBusinessCard (aBC)));
       _testResponseJerseyClient (aResponseMsg, 200);
 
       // Get BC - must work (always V3)
@@ -273,9 +270,8 @@ public void testGetCreateV2GetDeleteGet ()
       aBE.setCountryCode ("SE");
       aBE.setGeographicalInformation ("Stockholm");
       aBC.addBusinessEntity (aBE);
-      aResponseMsg = _addCredentials (aTarget.path ("businesscard")
-                                             .path (sPI)
-                                             .request ()).put (Entity.xml (m_aBC2ObjFactory.createBusinessCard (aBC)));
+      aResponseMsg = _addCredentials (aTarget.path ("businesscard").path (sPI).request ()).put (Entity.xml (
+                                                                                                            m_aBC2ObjFactory.createBusinessCard (aBC)));
       _testResponseJerseyClient (aResponseMsg, 200);
 
       // Get BC - must work (always V3)
@@ -327,8 +323,8 @@ public void testGetCreateV3GetDeleteGet ()
     try
     {
       // Create SG
-      aResponseMsg = _addCredentials (aTarget.path (sPI)
-                                             .request ()).put (Entity.xml (m_aObjFactory.createServiceGroup (aSG)));
+      aResponseMsg = _addCredentials (aTarget.path (sPI).request ()).put (Entity.xml (m_aObjFactory.createServiceGroup (
+                                                                                                                        aSG)));
       _testResponseJerseyClient (aResponseMsg, 200);
 
       // Get SG - must work
@@ -353,9 +349,8 @@ public void testGetCreateV3GetDeleteGet ()
       aBE.setGeographicalInformation ("Berlin");
       aBC.addBusinessEntity (aBE);
 
-      aResponseMsg = _addCredentials (aTarget.path ("businesscard")
-                                             .path (sPI)
-                                             .request ()).put (Entity.xml (m_aBC3ObjFactory.createBusinessCard (aBC)));
+      aResponseMsg = _addCredentials (aTarget.path ("businesscard").path (sPI).request ()).put (Entity.xml (
+                                                                                                            m_aBC3ObjFactory.createBusinessCard (aBC)));
       _testResponseJerseyClient (aResponseMsg, 200);
 
       // Get BC - must work (always V3)
@@ -372,9 +367,8 @@ public void testGetCreateV3GetDeleteGet ()
       aBE.setCountryCode ("SE");
       aBE.setGeographicalInformation ("Stockholm");
       aBC.addBusinessEntity (aBE);
-      aResponseMsg = _addCredentials (aTarget.path ("businesscard")
-                                             .path (sPI)
-                                             .request ()).put (Entity.xml (m_aBC3ObjFactory.createBusinessCard (aBC)));
+      aResponseMsg = _addCredentials (aTarget.path ("businesscard").path (sPI).request ()).put (Entity.xml (
+                                                                                                            m_aBC3ObjFactory.createBusinessCard (aBC)));
       _testResponseJerseyClient (aResponseMsg, 200);
 
       // Get BC - must work (always V3)

diff --git a/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorBusinessCardGet.java b/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorBusinessCardGet.java
@@ -22,8 +22,8 @@
 
 import com.helger.commons.annotation.Nonempty;
 import com.helger.commons.mime.CMimeType;
-import com.helger.pd.businesscard.v3.PD3BusinessCardMarshaller;
-import com.helger.pd.businesscard.v3.PD3BusinessCardType;
+import com.helger.peppol.businesscard.v3.PD3BusinessCardMarshaller;
+import com.helger.peppol.businesscard.v3.PD3BusinessCardType;
 import com.helger.phoss.smp.app.SMPWebAppConfiguration;
 import com.helger.phoss.smp.domain.SMPMetaManager;
 import com.helger.phoss.smp.exception.SMPPreconditionFailedException;

diff --git a/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorBusinessCardPut.java b/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorBusinessCardPut.java
@@ -25,8 +25,8 @@
 import com.helger.commons.http.CHttp;
 import com.helger.commons.io.stream.StreamHelper;
 import com.helger.commons.state.ESuccess;
-import com.helger.pd.businesscard.generic.PDBusinessCard;
-import com.helger.pd.businesscard.helper.PDBusinessCardHelper;
+import com.helger.peppol.businesscard.generic.PDBusinessCard;
+import com.helger.peppol.businesscard.helper.PDBusinessCardHelper;
 import com.helger.phoss.smp.app.SMPWebAppConfiguration;
 import com.helger.phoss.smp.domain.SMPMetaManager;
 import com.helger.phoss.smp.exception.SMPBadRequestException;

diff --git a/...s-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorQueryGetBusinessCard.java b/...s-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorQueryGetBusinessCard.java
@@ -39,8 +39,8 @@
 import com.helger.json.IJsonObject;
 import com.helger.json.serialize.JsonWriter;
 import com.helger.json.serialize.JsonWriterSettings;
-import com.helger.pd.businesscard.generic.PDBusinessCard;
-import com.helger.pd.businesscard.helper.PDBusinessCardHelper;
+import com.helger.peppol.businesscard.generic.PDBusinessCard;
+import com.helger.peppol.businesscard.helper.PDBusinessCardHelper;
 import com.helger.peppol.sml.ESMPAPIType;
 import com.helger.peppolid.IParticipantIdentifier;
 import com.helger.peppolid.factory.IIdentifierFactory;

diff --git a/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorQueryGetDocTypes.java b/phoss-smp-webapp/src/main/java/com/helger/phoss/smp/rest/APIExecutorQueryGetDocTypes.java
@@ -42,8 +42,8 @@
 import com.helger.json.JsonObject;
 import com.helger.json.serialize.JsonWriter;
 import com.helger.json.serialize.JsonWriterSettings;
-import com.helger.pd.businesscard.generic.PDBusinessCard;
-import com.helger.pd.businesscard.helper.PDBusinessCardHelper;
+import com.helger.peppol.businesscard.generic.PDBusinessCard;
+import com.helger.peppol.businesscard.helper.PDBusinessCardHelper;
 import com.helger.peppol.sml.ESMPAPIType;
 import com.helger.peppolid.CIdentifier;
 import com.helger.peppolid.IParticipantIdentifier;

diff --git a/pom.xml b/pom.xml
@@ -69,7 +69,7 @@
 
   <properties>
     <log4j.version>2.21.1</log4j.version>
-    <protobuf.version>3.24.1</protobuf.version>
+    <protobuf.version>3.25.0</protobuf.version>
   </properties>
 
   <dependencyManagement>
@@ -126,14 +126,20 @@
       <dependency>
         <groupId>com.helger.peppol</groupId>
         <artifactId>peppol-commons-parent-pom</artifactId>
-        <version>9.0.8</version>
+        <version>9.1.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <!--error in 9.1.0 parent pom -->
+      <dependency>
+        <groupId>com.helger.peppol</groupId>
+        <artifactId>peppol-directory-businesscard</artifactId>
+        <version>9.1.0</version>
+      </dependency>
       <dependency>
         <groupId>com.helger</groupId>
         <artifactId>phoss-directory-parent-pom</artifactId>
-        <version>0.12.2</version>
+        <version>0.13.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -150,7 +156,7 @@
       <dependency>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-bom</artifactId>
-        <version>2.15.2</version>
+        <version>2.15.3</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>