Skip to content

Commit

Permalink
Merge branch 'main' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
phax authored May 4, 2022
2 parents dd01fd6 + aad731f commit 3400ad2
Show file tree
Hide file tree
Showing 36 changed files with 151 additions and 82 deletions.
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Shared stuff for DE4A software components.

Last release:
* Iteration 2: **0.2.2**
* Iteration 2: **0.2.4**
* Iteration 1: **0.1.11**

In the DE4A project we are differentiating between "Iteration 1" and "Iteration 2". As they are incompatible, care needs to be taken, that they are not mixed together.
Expand All @@ -14,6 +14,8 @@ The `development` branch is used for development of Iteration 2 stuff.
## History

* v0.2.4 - 2022-04-13
* Fixed the date/time/dateTime JAXB binding for T41 and T42.
* Changed the package names in the `de4a-canonical-evidences` submodule
* v0.2.3 - 2022-04-13
* Renamed the submodule `de4a-iem` to `de4a-canonical-evidences`
* v0.2.2 - 2022-03-11
Expand Down Expand Up @@ -60,7 +62,8 @@ mvn clean install

and you receive a set of JAR files in the respective submodule `target` directory.

## Modules
## Submodules

* **de4a-kafka-client**: a small wrapper to send messages to the shared Kafka instance for remote debugging
* **de4a-iem**: a wrapper around the DE4A IEM (Information Exchange Model)
* **de4a-core-schemas**: a wrapper around the DE4A IEM (Information Exchange Model) core schemas
* **de4a-canonical-evidences**: a wrapper around the pilot specific canonical evidence types
5 changes: 3 additions & 2 deletions de4a-canonical-evidences/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,9 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Automatic-Module-Name>eu.de4a.iem.xml</Automatic-Module-Name>
<Export-Package>eu.de4a.iem.xml.*</Export-Package>
<Automatic-Module-Name>eu.de4a.iem.cev</Automatic-Module-Name>
<Export-Package>eu.de4a.iem.cev.*,
eu.de4a.ieam.jaxb.*</Export-Package>
<Import-Package>!javax.annotation.*,*</Import-Package>
<Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
<Provide-Capability>osgi.serviceloader; osgi.serviceloader=com.helger.schematron.svrl.ISVRLLocationBeautifierSPI</Provide-Capability>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package eu.de4a.iem.xml;
package eu.de4a.iem.cev;

import javax.annotation.concurrent.Immutable;

Expand All @@ -9,11 +9,11 @@
* @since 0.2.1
*/
@Immutable
public final class CIEM
public final class CCanonicalEvidences
{
// Iteration 2 identifier for the IEM "/SpecificationId" element
public static final String SPECIFICATION_ID = "de4a-iem-v2";

private CIEM ()
private CCanonicalEvidences ()
{}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a;
package eu.de4a.iem.cev;

import javax.annotation.Nonnull;

Expand All @@ -29,16 +29,16 @@
*/
public enum EDE4ACanonicalEvidenceType implements IDE4ACanonicalEvidenceType
{
T41_UC1_2021_02_11 ("t41-uc1-2021-02-11", "T4.1 UC1 v2021-02-11", eu.de4a.iem.xml.de4a.t41.v2021_02_11.CT41.getAllXSDs ()),
T41_UC1_2021_04_13 ("t41-uc1-2021-04-13", "T4.1 UC1 v2021-04-13", eu.de4a.iem.xml.de4a.t41.v2021_04_13.CT41.getAllXSDs ()),
T42_COMPANY_INFO_V06 ("t42-companyinfo-v06", "T4.2 Company Info v0.6", eu.de4a.iem.xml.de4a.t42.v0_6.CT42.getAllXSDs ()),
T43_BIRTH_EVIDENCE_V16B ("t43-birth-v16b", "T4.3 Birth Evidence v1.6b", eu.de4a.iem.xml.de4a.t43.v1_6b.CT43.getAllBirthEvidenceXSDs ()),
T41_UC1_2021_02_11 ("t41-uc1-2021-02-11", "T4.1 UC1 v2021-02-11", eu.de4a.iem.cev.de4a.t41.v2021_02_11.CT41.getAllXSDs ()),
T41_UC1_2021_04_13 ("t41-uc1-2021-04-13", "T4.1 UC1 v2021-04-13", eu.de4a.iem.cev.de4a.t41.v2021_04_13.CT41.getAllXSDs ()),
T42_COMPANY_INFO_V06 ("t42-companyinfo-v06", "T4.2 Company Info v0.6", eu.de4a.iem.cev.de4a.t42.v0_6.CT42.getAllXSDs ()),
T43_BIRTH_EVIDENCE_V16B ("t43-birth-v16b", "T4.3 Birth Evidence v1.6b", eu.de4a.iem.cev.de4a.t43.v1_6b.CT43.getAllBirthEvidenceXSDs ()),
T43_DOMREG_EVIDENCE_V16B ("t43-domreg-v16b",
"T4.3 Domicile Registration Evidence v1.6b",
eu.de4a.iem.xml.de4a.t43.v1_6b.CT43.getAllDomicileRegistrationEvidenceXSDs ()),
eu.de4a.iem.cev.de4a.t43.v1_6b.CT43.getAllDomicileRegistrationEvidenceXSDs ()),
T43_MARRIAGE_EVIDENCE_V16B ("t43-marriage-v16b",
"T4.3 Marriage Evidence v1.6b",
eu.de4a.iem.xml.de4a.t43.v1_6b.CT43.getAllMarriageEvidenceXSDs ());
eu.de4a.iem.cev.de4a.t43.v1_6b.CT43.getAllMarriageEvidenceXSDs ());

private final String m_sID;
private final String m_sDisplayName;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a.t41.v2021_02_11;
package eu.de4a.iem.cev.de4a.t41.v2021_02_11;

import javax.annotation.Nonnull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a.t41.v2021_02_11;
package eu.de4a.iem.cev.de4a.t41.v2021_02_11;

import java.util.function.Function;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a.t41.v2021_02_11;
package eu.de4a.iem.cev.de4a.t41.v2021_02_11;

import javax.annotation.Nonnull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a.t41.v2021_04_13;
package eu.de4a.iem.cev.de4a.t41.v2021_04_13;

import javax.annotation.Nonnull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a.t41.v2021_04_13;
package eu.de4a.iem.cev.de4a.t41.v2021_04_13;

import java.util.function.Function;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a.t41.v2021_04_13;
package eu.de4a.iem.cev.de4a.t41.v2021_04_13;

import javax.annotation.Nonnull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a.t42.v0_6;
package eu.de4a.iem.cev.de4a.t42.v0_6;

import javax.annotation.Nonnull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a.t42.v0_6;
package eu.de4a.iem.cev.de4a.t42.v0_6;

import java.util.function.Function;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a.t42.v0_6;
package eu.de4a.iem.cev.de4a.t42.v0_6;

import javax.annotation.Nonnull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a.t43.v1_6b;
package eu.de4a.iem.cev.de4a.t43.v1_6b;

import javax.annotation.Nonnull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a.t43.v1_6b;
package eu.de4a.iem.cev.de4a.t43.v1_6b;

import java.util.List;
import java.util.function.Function;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a.t43.v1_6b;
package eu.de4a.iem.cev.de4a.t43.v1_6b;

import javax.annotation.Nonnull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@
xmlns="http://java.sun.com/xml/ns/jaxb"
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<globalBindings fixedAttributeAsConstantProperty="true"
typesafeEnumMaxMembers="3000"
typesafeEnumMemberName="generateName"
underscoreBinding="asCharInWord">
<xjc:javaType name="com.helger.commons.datetime.XMLOffsetDateTime" xmlType="xsd:dateTime" adapter="com.helger.jaxb.adapter.AdapterXMLOffsetDateTime" />
<xjc:javaType name="com.helger.commons.datetime.XMLOffsetDate" xmlType="xsd:date" adapter="com.helger.jaxb.adapter.AdapterXMLOffsetDate" />
<xjc:javaType name="com.helger.commons.datetime.XMLOffsetTime" xmlType="xsd:time" adapter="com.helger.jaxb.adapter.AdapterXMLOffsetTime" />
</globalBindings>

<!-- CV 1.1 -->
<bindings schemaLocation="../resources/schemas/pilot-shared/CoreVocabularies-BasicComponents-1.1.xsd">
<schemaBindings>
Expand Down
10 changes: 10 additions & 0 deletions de4a-canonical-evidences/src/main/jaxb/bindings-t41.xjb
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@
</bindings>
</bindings>
</bindings>
<bindings schemaLocation="../resources/schemas/t4.1/uc1/edci_credentialTypes.xsd">
<schemaBindings>
<package name="eu.de4a.iem.jaxb.t41.edci" />
</schemaBindings>
</bindings>
<bindings schemaLocation="../resources/schemas/t4.1/uc1/w3c_verifiableCredentials.xsd">
<schemaBindings>
<package name="eu.de4a.iem.jaxb.t41.edci.w3c" />
</schemaBindings>
</bindings>
<bindings schemaLocation="../resources/schemas/t4.1/uc1/SA-UC1-11-02-2021.xsd">
<schemaBindings>
<package name="eu.de4a.iem.jaxb.t41.uc1.v2021_02_11" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a;
package eu.de4a.iem.cev;

import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
Expand All @@ -31,9 +31,9 @@
*
* @author Philip Helger
*/
public final class DE4AMarshallerTest
public final class DE4ACoreMarshallerTest
{
private static final Logger LOGGER = LoggerFactory.getLogger (DE4AMarshallerTest.class);
private static final Logger LOGGER = LoggerFactory.getLogger (DE4ACoreMarshallerTest.class);
private static final String BASE_PATH = "src/test/resources/de4a/";

@SuppressWarnings ("unused")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem;
package eu.de4a.iem.cev;

import org.junit.Test;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a.t41.v2021_04_13;
package eu.de4a.iem.cev.de4a.t41.v2021_02_11;

import static org.junit.Assert.assertTrue;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a.t41.v2021_02_11;
package eu.de4a.iem.cev.de4a.t41.v2021_02_11;

import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a.t41.v2021_02_11;
package eu.de4a.iem.cev.de4a.t41.v2021_04_13;

import static org.junit.Assert.assertTrue;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a.t41.v2021_04_13;
package eu.de4a.iem.cev.de4a.t41.v2021_04_13;

import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a.t42.v0_6;
package eu.de4a.iem.cev.de4a.t42.v0_6;

import static org.junit.Assert.assertTrue;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a.t42.v0_6;
package eu.de4a.iem.cev.de4a.t42.v0_6;

import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a.t43.v1_6b;
package eu.de4a.iem.cev.de4a.t43.v1_6b;

import static org.junit.Assert.assertTrue;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.de4a.iem.xml.de4a.t43.v1_6b;
package eu.de4a.iem.cev.de4a.t43.v1_6b;

import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ private static ClassLoader _getCL ()
final ICommonsList <ClassPathResource> a = new CommonsArrayList <> ();
a.add (CXML_XSD.getXSDResource ());
a.add (CCCTS.getXSDResource ());
a.add (new ClassPathResource ("schemas/core/provided/CV-DataTypes.xsd", _getCL ()));
a.add (new ClassPathResource ("schemas/core/external/CV-DataTypes.xsd", _getCL ()));
a.add (new ClassPathResource ("schemas/core/external/eidas-LP.xsd", _getCL ()));
a.add (new ClassPathResource ("schemas/core/external/eidas-NP.xsd", _getCL ()));
a.add (new ClassPathResource ("schemas/core/de4a/common-types.xsd", _getCL ()));
Expand All @@ -54,7 +54,8 @@ private static ClassLoader _getCL ()
public static final ClassPathResource XSD_DT = new ClassPathResource ("schemas/core/DT.xsd", _getCL ());
public static final ClassPathResource XSD_DO = new ClassPathResource ("schemas/core/DO.xsd", _getCL ());

public static final ClassPathResource XSD_DEFAULT_RESPONSE = new ClassPathResource ("schemas/core/def-response.xsd", _getCL ());
public static final ClassPathResource XSD_DEFAULT_RESPONSE = new ClassPathResource ("schemas/core/def-response.xsd",
_getCL ());

private CDE4ACoreJAXB ()
{}
Expand Down
18 changes: 10 additions & 8 deletions de4a-core-schemas/src/main/jaxb/bindings-core.xjb
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,13 @@
<xjc:javaType name="com.helger.commons.datetime.XMLOffsetDate" xmlType="xsd:date" adapter="com.helger.jaxb.adapter.AdapterXMLOffsetDate" />
<xjc:javaType name="com.helger.commons.datetime.XMLOffsetTime" xmlType="xsd:time" adapter="com.helger.jaxb.adapter.AdapterXMLOffsetTime" />
</globalBindings>
<bindings schemaLocation="../resources/schemas/core/provided/CV-DataTypes.xsd">

<!-- External stuff -->
<bindings schemaLocation="../resources/schemas/core/external/CV-DataTypes.xsd">
<schemaBindings>
<package name="eu.de4a.iem.core.jaxb.cv.dt" />
</schemaBindings>
</bindings>

<!-- DE4A stuff -->
<bindings schemaLocation="../resources/schemas/core/de4a/common-types.xsd">
<schemaBindings>
<package name="eu.de4a.iem.core.jaxb.common" />
</schemaBindings>
</bindings>
<bindings schemaLocation="../resources/schemas/core/external/eidas-LP.xsd">
<schemaBindings>
<package name="eu.de4a.iem.core.jaxb.eidas.lp" />
Expand All @@ -48,6 +43,13 @@
<package name="eu.de4a.iem.core.jaxb.eidas.np" />
</schemaBindings>
</bindings>

<!-- DE4A stuff -->
<bindings schemaLocation="../resources/schemas/core/de4a/common-types.xsd">
<schemaBindings>
<package name="eu.de4a.iem.core.jaxb.common" />
</schemaBindings>
</bindings>

<bindings schemaLocation="../resources/schemas/core/DE.xsd">
<schemaBindings>
Expand Down
Loading

0 comments on commit 3400ad2

Please sign in to comment.