settings) {
+ final Path pluginPath = settings.getPath(FileSystemConf.PLUGIN, homeDirectory);
+ log.info("Loading plugins from '{}'.", pluginPath);
+ return ClassLoaderUtils.initiate(pluginPath);
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/plugin/package-info.java b/oxalis-commons/src/main/java/network/oxalis/commons/plugin/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..4770f3b6ba286e5e0de926d0469801fb024dd06c
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/plugin/package-info.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+/**
+ * This package contains functionality to support loading of extensions to Oxalis found in jar-files outside classpath
+ * of Oxalis.
+ *
+ * Please see ServiceLoader
+ * documentation on how to implement extensions to be loaded using this pacakge.
+ *
+ * @author steinar
+ * @author erlend
+ * @since 4.0.0
+ */
+package network.oxalis.commons.plugin;
\ No newline at end of file
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/security/CertificateModule.java b/oxalis-commons/src/main/java/network/oxalis/commons/security/CertificateModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..0cf7db7713aaa5960dbd49cfb18e61634b286973
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/security/CertificateModule.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.security;
+
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import com.google.inject.name.Named;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.api.lang.OxalisLoadingException;
+import network.oxalis.api.model.AccessPointIdentifier;
+import network.oxalis.api.settings.Settings;
+import network.oxalis.commons.guice.OxalisModule;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.*;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+/**
+ * @author erlend
+ * @since 4.0.0
+ */
+@Slf4j
+public class CertificateModule extends OxalisModule {
+
+ @Override
+ protected void configure() {
+ bindSettings(KeyStoreConf.class);
+
+ bind(KeyStore.PrivateKeyEntry.class)
+ .toProvider(PrivateKeyEntryProvider.class)
+ .asEagerSingleton();
+ }
+
+ @Provides
+ @Singleton
+ protected KeyStore getKeyStore(Settings settings, @Named("conf") Path confFolder) {
+ Path path = settings.getPath(KeyStoreConf.PATH, confFolder);
+
+ try {
+ KeyStore keystore = KeyStore.getInstance("JKS");
+
+ if (Files.notExists(path))
+ throw new OxalisLoadingException(String.format("Unable to find keystore at '%s'.", path));
+
+ try (InputStream inputStream = Files.newInputStream(path)) {
+ keystore.load(inputStream, settings.getString(KeyStoreConf.PASSWORD).toCharArray());
+ }
+ return keystore;
+ } catch (KeyStoreException | NoSuchAlgorithmException | CertificateException e) {
+ throw new OxalisLoadingException("Something went wrong during handling of key store.", e);
+ } catch (IOException e) {
+ throw new OxalisLoadingException(String.format("Error during reading of '%s'.", path), e);
+ }
+ }
+
+ @Provides
+ @Singleton
+ protected PrivateKey getPrivateKeyEntry(KeyStore keyStore, Settings settings) {
+ try {
+ if (!keyStore.containsAlias(settings.getString(KeyStoreConf.KEY_ALIAS)))
+ throw new OxalisLoadingException(String.format(
+ "Key alias '%s' is not found in the key store.",
+ settings.getString(KeyStoreConf.KEY_ALIAS)));
+
+ PrivateKey privateKey = (PrivateKey) keyStore.getKey(
+ settings.getString(KeyStoreConf.KEY_ALIAS),
+ settings.getString(KeyStoreConf.KEY_PASSWORD).toCharArray());
+
+ if (privateKey == null)
+ throw new OxalisLoadingException("Unable to load private key due to wrong password.");
+
+ return privateKey;
+ } catch (UnrecoverableKeyException e) {
+ throw new OxalisLoadingException("Unable to load private key due to wrong password.", e);
+ } catch (KeyStoreException | NoSuchAlgorithmException e) {
+ throw new OxalisLoadingException("Something went wrong during handling of key store.", e);
+ }
+ }
+
+ @Provides
+ @Singleton
+ protected X509Certificate getCertificate(KeyStore keyStore, Settings settings) {
+ try {
+ if (!keyStore.containsAlias(settings.getString(KeyStoreConf.KEY_ALIAS)))
+ throw new OxalisLoadingException(String.format(
+ "Key alias '%s' is not found in the key store.", settings.getString(KeyStoreConf.KEY_ALIAS)));
+
+ X509Certificate certificate = (X509Certificate) keyStore.
+ getCertificate(settings.getString(KeyStoreConf.KEY_ALIAS));
+
+ log.info("Certificate subject: {}", certificate.getSubjectX500Principal().toString());
+ log.info("Certificate issuer: {}", certificate.getIssuerX500Principal().toString());
+ // log.info("Certificate: {}", BaseEncoding.base64().encode(certificate.getEncoded()));
+
+ return certificate;
+ } catch (KeyStoreException e) {
+ throw new OxalisLoadingException("Something went wrong during handling of key store.", e);
+ }
+ }
+
+ @Provides
+ @Singleton
+ protected AccessPointIdentifier provideOurAccessPointIdentifier(X509Certificate certificate) {
+ return new AccessPointIdentifier(CertificateUtils.extractCommonName(certificate));
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/security/CertificateUtils.java b/oxalis-commons/src/main/java/network/oxalis/commons/security/CertificateUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..de6859c883d0803d49677f7d5445fa62ba27653c
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/security/CertificateUtils.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.security;
+
+import org.bouncycastle.asn1.x500.RDN;
+import org.bouncycastle.asn1.x500.X500Name;
+import org.bouncycastle.asn1.x500.style.BCStyle;
+import org.bouncycastle.asn1.x500.style.IETFUtils;
+
+import javax.security.auth.x500.X500Principal;
+import java.io.ByteArrayInputStream;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+
+/**
+ * @author erlend
+ * @since 4.0.0
+ */
+public class CertificateUtils {
+
+ private static final CertificateFactory CERTIFICATE_FACTORY;
+
+ static {
+ try {
+ CERTIFICATE_FACTORY = CertificateFactory.getInstance("X.509");
+ } catch (CertificateException e) {
+ throw new IllegalStateException(e.getMessage(), e);
+ }
+ }
+
+
+ /**
+ * From https://stackoverflow.com/a/8322929/135001
+ *
+ * @param cert X.509 Certificate
+ * @return Extracted Common Name from certificate.
+ */
+ public static String extractCommonName(X509Certificate cert) {
+ X500Principal principal = cert.getSubjectX500Principal();
+
+ return extractCommonName(new X500Name(principal.getName()));
+ }
+
+ /**
+ * @since 4.0.3
+ */
+ public static String extractCommonName(X500Name x500name) {
+ RDN cn = x500name.getRDNs(BCStyle.CN)[0];
+
+ return IETFUtils.valueToString(cn.getFirst().getValue());
+ }
+
+ /**
+ * Compare a provided Common Name with a given certificate.
+ *
+ * @since 4.0.3
+ */
+ public static boolean containsCommonName(X509Certificate cert, String commonName) {
+ return commonName == null || commonName.trim().equalsIgnoreCase(extractCommonName(cert));
+ }
+
+ /**
+ * Compare a provided Common Name with a given certificate.
+ *
+ * @since 4.0.3
+ */
+ public static boolean containsCommonName(X500Name x500name, String commonName) {
+ return commonName == null || commonName.trim().equalsIgnoreCase(extractCommonName(x500name));
+ }
+
+ /**
+ * @since 4.0.3
+ */
+ public static X509Certificate parseCertificate(byte[] encoded) throws CertificateException {
+ return (X509Certificate) CERTIFICATE_FACTORY.generateCertificate(new ByteArrayInputStream(encoded));
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/security/KeyStoreConf.java b/oxalis-commons/src/main/java/network/oxalis/commons/security/KeyStoreConf.java
new file mode 100644
index 0000000000000000000000000000000000000000..dc59eea78cee286a248987149b03587678792ab3
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/security/KeyStoreConf.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.security;
+
+import network.oxalis.api.settings.DefaultValue;
+import network.oxalis.api.settings.Path;
+import network.oxalis.api.settings.Secret;
+import network.oxalis.api.settings.Title;
+
+/**
+ * @author erlend
+ * @since 4.0.0
+ */
+@Title("Key store")
+public enum KeyStoreConf {
+
+ @Path("oxalis.keystore.path")
+ @DefaultValue("oxalis-keystore.jks")
+ PATH,
+
+ @Path("oxalis.keystore.password")
+ @DefaultValue("changeit")
+ @Secret
+ PASSWORD,
+
+ @Path("oxalis.keystore.key.alias")
+ @DefaultValue("ap")
+ KEY_ALIAS,
+
+ @Path("oxalis.keystore.key.password")
+ @DefaultValue("changeit")
+ @Secret
+ KEY_PASSWORD
+
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/security/PrivateKeyEntryProvider.java b/oxalis-commons/src/main/java/network/oxalis/commons/security/PrivateKeyEntryProvider.java
new file mode 100644
index 0000000000000000000000000000000000000000..1c471652ceb547b9945e2c55a809de8d30b7ba85
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/security/PrivateKeyEntryProvider.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2010-2017 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.security;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
+
+/**
+ * @author erlend
+ * @since 4.0.4
+ */
+public class PrivateKeyEntryProvider implements Provider {
+
+ @Inject
+ private PrivateKey privateKey;
+
+ @Inject
+ private X509Certificate certificate;
+
+ @Override
+ public KeyStore.PrivateKeyEntry get() {
+ return new KeyStore.PrivateKeyEntry(
+ privateKey,
+ new Certificate[]{certificate}
+ );
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/settings/SettingsBuilder.java b/oxalis-commons/src/main/java/network/oxalis/commons/settings/SettingsBuilder.java
new file mode 100644
index 0000000000000000000000000000000000000000..04e0ee0bba64838d5df53e42fcce4f285ea325e3
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/settings/SettingsBuilder.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.settings;
+
+import com.google.inject.*;
+import com.google.inject.util.Types;
+import com.typesafe.config.Config;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.api.settings.Path;
+import network.oxalis.api.settings.Settings;
+import network.oxalis.api.settings.Title;
+import network.oxalis.commons.persist.PersisterConf;
+import network.oxalis.commons.guice.OxalisModule;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Binds the parameterized configuration values described in annotations on enums to the configuration values
+ * found in the supplied type safe config.
+ *
+ * @author erlend
+ * @since 4.0.0
+ */
+@Slf4j
+public class SettingsBuilder implements Provider> {
+
+ private Config config;
+
+ private final Map settings = new HashMap<>();
+
+ private final String title;
+
+ /**
+ * Binds the annotations of the supplied configuration enum as guice names with the values obtained from
+ * typesafe config.
+ *
+ * @param binder current Guice binder
+ * @param cls the enum class with annotations
+ * @param the type literal of the enum for instance {@link PersisterConf}
+ * @return instance of SettingsBuilder
+ */
+ @SuppressWarnings("unchecked")
+ public static SettingsBuilder with(Binder binder, Class cls) {
+
+ // Grabs the value of the @Title annotation and creates instance of SettingsBuilder of the enum
+ SettingsBuilder settingsBuilder = new SettingsBuilder<>(cls.getAnnotation(Title.class).value());
+
+ binder.skipSources(SettingsBuilder.class, OxalisModule.class)
+ .bind((Key>) Key.get(Types.newParameterizedType(Settings.class, cls)))
+ .toProvider(settingsBuilder)
+ .in(Singleton.class);
+
+ binder.skipSources(SettingsBuilder.class, OxalisModule.class).requestInjection(settingsBuilder);
+
+ for (T t : cls.getEnumConstants())
+ settingsBuilder.add(t);
+
+ return settingsBuilder;
+ }
+
+ private SettingsBuilder(String title) {
+ this.title = title;
+ }
+
+ private void add(T key) {
+ settings.put(key, TypesafeSettings.getField(key).getAnnotation(Path.class).value());
+ }
+
+ @Inject
+ public void setConfig(Config config) {
+ this.config = config;
+
+ Settings result = get();
+
+ settings.keySet().stream()
+ .sorted()
+ .forEach(key -> log.info("{} => {}: {}",
+ title, key, result.toLogSafeString(key)));
+ }
+
+ @Override
+ public Settings get() {
+ return new TypesafeSettings<>(config, settings);
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/settings/TypesafeSettings.java b/oxalis-commons/src/main/java/network/oxalis/commons/settings/TypesafeSettings.java
new file mode 100644
index 0000000000000000000000000000000000000000..80eda5565fb0db1a219c52853f4ba5d43c7d92b5
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/settings/TypesafeSettings.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.settings;
+
+import com.google.inject.Inject;
+import com.typesafe.config.Config;
+import network.oxalis.api.lang.OxalisLoadingException;
+import network.oxalis.api.settings.Secret;
+import network.oxalis.api.settings.Settings;
+import network.oxalis.api.settings.DefaultValue;
+import network.oxalis.api.settings.Nullable;
+
+import java.lang.reflect.Field;
+import java.util.Map;
+
+/**
+ * @author erlend
+ * @since 4.0.0
+ */
+class TypesafeSettings implements Settings {
+
+ private final Config config;
+
+ private final Map settings;
+
+ @Inject
+ public TypesafeSettings(Config config, Map settings) {
+ this.config = config;
+ this.settings = settings;
+ }
+
+ @Override
+ public String getString(T key) {
+ if (config.hasPath(settings.get(key))) {
+ return config.getString(settings.get(key));
+ } else {
+ Field field = getField(key);
+
+ if (field.getAnnotation(Nullable.class) != null)
+ return null;
+ else if (field.getAnnotation(DefaultValue.class) != null)
+ return field.getAnnotation(DefaultValue.class).value();
+
+ throw new OxalisLoadingException(String.format("Setting '%s' not found.", settings.get(key)));
+ }
+ }
+
+ @Override
+ public int getInt(T key) {
+ if (config.hasPath(settings.get(key))) {
+ return config.getInt(settings.get(key));
+ } else {
+ return Integer.parseInt(getString(key));
+ }
+ }
+
+ @Override
+ public String toLogSafeString(T key) {
+ Field field = getField(key);
+ boolean isSecret = field.getAnnotation(Secret.class) != null;
+
+ if (config.hasPath(settings.get(key))) {
+ String value = config.getString(settings.get(key));
+ return maskIfSecret(value, isSecret);
+ } else if (field.getAnnotation(DefaultValue.class) != null) {
+ return field.getAnnotation(DefaultValue.class).value();
+ } else if (field.getAnnotation(Nullable.class) != null) {
+ return "";
+ } else {
+ throw new OxalisLoadingException(String.format("Setting '%s' not found.", settings.get(key)));
+ }
+ }
+
+ private String maskIfSecret(String value, boolean isSecret ) {
+ if(isSecret){
+ return value.replaceAll(".", "*");
+ }
+ return value;
+ }
+
+ protected static Field getField(T key) {
+ try {
+ return key.getClass().getField(((Enum) key).name());
+ } catch (NoSuchFieldException e) {
+ throw new OxalisLoadingException(e.getMessage(), e);
+ }
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/statistics/NoopStatisticsService.java b/oxalis-commons/src/main/java/network/oxalis/commons/statistics/NoopStatisticsService.java
new file mode 100644
index 0000000000000000000000000000000000000000..1471ff8cd1f1155098f775f62674ae7a76dc46fd
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/statistics/NoopStatisticsService.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.statistics;
+
+import com.google.inject.Singleton;
+import io.opentracing.Span;
+import network.oxalis.api.inbound.InboundMetadata;
+import network.oxalis.api.outbound.TransmissionRequest;
+import network.oxalis.api.outbound.TransmissionResponse;
+import network.oxalis.api.statistics.StatisticsService;
+import network.oxalis.api.util.Type;
+
+/**
+ * NOOP implementation of {@link StatisticsService}.
+ */
+@Singleton
+@Type("noop")
+public class NoopStatisticsService implements StatisticsService {
+
+ @Override
+ public void persist(TransmissionRequest transmissionRequest,
+ TransmissionResponse transmissionResponse, Span root) {
+ // No action.
+ }
+
+ @Override
+ public void persist(InboundMetadata inboundMetadata) {
+ // No action.
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/statistics/StatisticsConf.java b/oxalis-commons/src/main/java/network/oxalis/commons/statistics/StatisticsConf.java
new file mode 100644
index 0000000000000000000000000000000000000000..46df673d062ca02f22972e72a95c08c5922fcf0a
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/statistics/StatisticsConf.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.statistics;
+
+import network.oxalis.api.settings.DefaultValue;
+import network.oxalis.api.settings.Path;
+import network.oxalis.api.settings.Title;
+
+/**
+ * @author erlend
+ * @since 4.0.0
+ */
+@Title("Statistics")
+public enum StatisticsConf {
+
+ @Path("oxalis.statistics.service")
+ @DefaultValue("noop")
+ SERVICE
+
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/statistics/StatisticsModule.java b/oxalis-commons/src/main/java/network/oxalis/commons/statistics/StatisticsModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..09ee47ded4ccd44c64c4e68e9d7956f1074abb86
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/statistics/StatisticsModule.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.statistics;
+
+import com.google.inject.Injector;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import network.oxalis.api.settings.Settings;
+import network.oxalis.api.statistics.StatisticsService;
+import network.oxalis.commons.guice.ImplLoader;
+import network.oxalis.commons.guice.OxalisModule;
+
+public class StatisticsModule extends OxalisModule {
+
+ @Override
+ protected void configure() {
+ bindSettings(StatisticsConf.class);
+
+ bindTyped(StatisticsService.class, NoopStatisticsService.class);
+ }
+
+ @Provides
+ @Singleton
+ protected StatisticsService getStatisticsService(Injector injector, Settings settings) {
+ return ImplLoader.get(injector, StatisticsService.class, settings, StatisticsConf.SERVICE);
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/tag/NoopTagGenerator.java b/oxalis-commons/src/main/java/network/oxalis/commons/tag/NoopTagGenerator.java
new file mode 100644
index 0000000000000000000000000000000000000000..94d498b6c22522ab1a9ae4df4707c70119abc3be
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/tag/NoopTagGenerator.java
@@ -0,0 +1,19 @@
+package network.oxalis.commons.tag;
+
+import network.oxalis.api.model.Direction;
+import network.oxalis.api.tag.Tag;
+import network.oxalis.api.tag.TagGenerator;
+import network.oxalis.api.util.Type;
+
+/**
+ * @author erlend
+ * @since 4.0.2
+ */
+@Type("noop")
+public class NoopTagGenerator implements TagGenerator {
+
+ @Override
+ public Tag generate(Direction direction) {
+ return Tag.NONE;
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/tag/TagConf.java b/oxalis-commons/src/main/java/network/oxalis/commons/tag/TagConf.java
new file mode 100644
index 0000000000000000000000000000000000000000..ddf45fe678d7484f80614eb8a1652883f14a0fe4
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/tag/TagConf.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.tag;
+
+import network.oxalis.api.settings.DefaultValue;
+import network.oxalis.api.settings.Path;
+import network.oxalis.api.settings.Title;
+
+/**
+ * @author erlend
+ * @since 4.0.0
+ */
+@Title("Tag")
+public enum TagConf {
+
+ @Path("oxalis.tag.generator")
+ @DefaultValue("noop")
+ GENERATOR
+
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/tag/TagModule.java b/oxalis-commons/src/main/java/network/oxalis/commons/tag/TagModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..07a6f060f7e53f81a6ec1d078a8bc1fb00beccdc
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/tag/TagModule.java
@@ -0,0 +1,29 @@
+package network.oxalis.commons.tag;
+
+import com.google.inject.Injector;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import network.oxalis.api.settings.Settings;
+import network.oxalis.api.tag.TagGenerator;
+import network.oxalis.commons.guice.ImplLoader;
+import network.oxalis.commons.guice.OxalisModule;
+
+/**
+ * @author erlend
+ * @since 4.0.2
+ */
+public class TagModule extends OxalisModule {
+
+ @Override
+ protected void configure() {
+ bindTyped(TagGenerator.class, NoopTagGenerator.class);
+
+ bindSettings(TagConf.class);
+ }
+
+ @Provides
+ @Singleton
+ protected TagGenerator getTagGenerator(Injector injector, Settings settings) {
+ return ImplLoader.get(injector, TagGenerator.class, settings, TagConf.GENERATOR);
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/timestamp/SystemTimestampProvider.java b/oxalis-commons/src/main/java/network/oxalis/commons/timestamp/SystemTimestampProvider.java
new file mode 100644
index 0000000000000000000000000000000000000000..a92e7198019da07654f56e1ac934918f6eb10fa3
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/timestamp/SystemTimestampProvider.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.timestamp;
+
+import com.google.inject.Singleton;
+import network.oxalis.api.model.Direction;
+import network.oxalis.api.timestamp.Timestamp;
+import network.oxalis.api.timestamp.TimestampProvider;
+import network.oxalis.api.util.Type;
+
+import java.util.Date;
+
+/**
+ * Implementation of {@link TimestampProvider} simply providing timestamps using internal computer clock.
+ *
+ * @author erlend
+ * @since 4.0.0
+ */
+@Singleton
+@Type("system")
+class SystemTimestampProvider implements TimestampProvider {
+
+ @Override
+ public Timestamp generate(byte[] content, Direction direction) {
+ return new Timestamp(new Date(), null);
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/timestamp/TimestampConf.java b/oxalis-commons/src/main/java/network/oxalis/commons/timestamp/TimestampConf.java
new file mode 100644
index 0000000000000000000000000000000000000000..9ee35e235db97e3095df50958807c77efd86fc56
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/timestamp/TimestampConf.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.timestamp;
+
+import network.oxalis.api.settings.DefaultValue;
+import network.oxalis.api.settings.Path;
+import network.oxalis.api.settings.Title;
+
+/**
+ * @author erlend
+ * @since 4.0.0
+ */
+@Title("Timestamp")
+public enum TimestampConf {
+
+ @Path("oxalis.timestamp.service")
+ @DefaultValue("system")
+ SERVICE
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/timestamp/TimestampModule.java b/oxalis-commons/src/main/java/network/oxalis/commons/timestamp/TimestampModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..f96b18ee84ed7e3bc250b3cef617830390396f51
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/timestamp/TimestampModule.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.timestamp;
+
+import com.google.inject.Injector;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import network.oxalis.api.settings.Settings;
+import network.oxalis.api.timestamp.TimestampProvider;
+import network.oxalis.commons.guice.ImplLoader;
+import network.oxalis.commons.guice.OxalisModule;
+
+/**
+ * Guice module making a default implementation of {@link TimestampProvider} available.
+ *
+ * Available services (timestamp.service):
+ *
+ *
+ * @author erlend
+ * @since 4.0.0
+ */
+public class TimestampModule extends OxalisModule {
+
+ @Override
+ protected void configure() {
+ bindTyped(TimestampProvider.class, SystemTimestampProvider.class);
+
+ bindSettings(TimestampConf.class);
+ }
+
+ @Provides
+ @Singleton
+ protected TimestampProvider getTimestampProvider(Injector injector, Settings settings) {
+ return ImplLoader.get(injector, TimestampProvider.class, settings, TimestampConf.SERVICE);
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/tracing/BraveConf.java b/oxalis-commons/src/main/java/network/oxalis/commons/tracing/BraveConf.java
new file mode 100644
index 0000000000000000000000000000000000000000..33722cf26cb9705f388f142722a72633a96b3413
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/tracing/BraveConf.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.tracing;
+
+import network.oxalis.api.settings.DefaultValue;
+import network.oxalis.api.settings.Nullable;
+import network.oxalis.api.settings.Path;
+import network.oxalis.api.settings.Title;
+
+/**
+ * @author erlend
+ */
+@Title("Tracing")
+public enum BraveConf {
+
+ @Path("oxalis.tracing.brave.reporter")
+ @DefaultValue("noop")
+ REPORTER,
+
+ @Path("oxalis.tracing.brave.http")
+ @Nullable
+ HTTP
+
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/tracing/BraveTracerProvider.java b/oxalis-commons/src/main/java/network/oxalis/commons/tracing/BraveTracerProvider.java
new file mode 100644
index 0000000000000000000000000000000000000000..ecf85db6152d6b9307a658ed0814c5106b52025b
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/tracing/BraveTracerProvider.java
@@ -0,0 +1,27 @@
+package network.oxalis.commons.tracing;
+
+import brave.Tracing;
+import brave.opentracing.BraveTracer;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import io.opentracing.Tracer;
+import zipkin2.reporter.Reporter;
+
+/**
+ * @author erlend
+ */
+public class BraveTracerProvider implements Provider {
+
+ @Inject
+ private Reporter reporter;
+
+ @Override
+ public Tracer get() {
+ Tracing tracing = Tracing.newBuilder()
+ .localServiceName("Oxalis")
+ .spanReporter(reporter)
+ .build();
+
+ return BraveTracer.create(tracing);
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/tracing/Slf4jReporter.java b/oxalis-commons/src/main/java/network/oxalis/commons/tracing/Slf4jReporter.java
new file mode 100644
index 0000000000000000000000000000000000000000..721affef610f88b0bce80e6c0ebba6d85efef75e
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/tracing/Slf4jReporter.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.tracing;
+
+import com.google.inject.Singleton;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.api.util.Type;
+import zipkin2.Span;
+import zipkin2.reporter.Reporter;
+
+/**
+ * Implementation of ZipKin Reporter putting tracing data in SLF4J logger.
+ *
+ * @author erlend
+ * @since 4.0.0
+ */
+@Slf4j
+@Singleton
+@Type("slf4j")
+public class Slf4jReporter implements Reporter {
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void report(Span span) {
+ log.info("{}", span);
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/tracing/Traceable.java b/oxalis-commons/src/main/java/network/oxalis/commons/tracing/Traceable.java
new file mode 100644
index 0000000000000000000000000000000000000000..f139006b100216e07e07d114341f6b18a6002bbd
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/tracing/Traceable.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.tracing;
+
+import io.opentracing.Tracer;
+
+/**
+ * Simple abstract class making {@link Tracer} object available in a standardized manner for classes extending this
+ * class.
+ *
+ * @author erlend
+ * @since 4.0.0
+ */
+public abstract class Traceable {
+
+ /**
+ * Zipkin tracer implementation.
+ */
+ protected final Tracer tracer;
+
+ /**
+ * Default constructor accepting a tracer.
+ *
+ * @param tracer Tracer from application context.
+ */
+ protected Traceable(Tracer tracer) {
+ this.tracer = tracer;
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/tracing/TracingConf.java b/oxalis-commons/src/main/java/network/oxalis/commons/tracing/TracingConf.java
new file mode 100644
index 0000000000000000000000000000000000000000..db7de14e4a0fb8c503298c1b02eb61acb517065f
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/tracing/TracingConf.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.tracing;
+
+import network.oxalis.api.settings.DefaultValue;
+import network.oxalis.api.settings.Path;
+import network.oxalis.api.settings.Title;
+
+/**
+ * @author erlend
+ */
+@Title("Tracing")
+public enum TracingConf {
+
+ @Path("oxalis.tracing.tracer")
+ @DefaultValue("noop")
+ TRACER,
+
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/tracing/TracingModule.java b/oxalis-commons/src/main/java/network/oxalis/commons/tracing/TracingModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..b971eab1c82897eeedefa0da408913c0cbfc6ef4
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/tracing/TracingModule.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.tracing;
+
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import com.google.inject.name.Named;
+import com.google.inject.name.Names;
+import io.opentracing.Tracer;
+import io.opentracing.noop.NoopTracerFactory;
+import network.oxalis.api.settings.Settings;
+import network.oxalis.commons.guice.ImplLoader;
+import network.oxalis.commons.guice.OxalisModule;
+import zipkin2.reporter.AsyncReporter;
+import zipkin2.reporter.Reporter;
+import zipkin2.reporter.urlconnection.URLConnectionSender;
+
+/**
+ *
+ * Available reports (brave.reporter):
+ *
+ * - console
+ * - http
+ * - slf4j
+ *
+ *
+ * @author erlend
+ * @since 4.0.0
+ */
+public class TracingModule extends OxalisModule {
+
+ @Override
+ protected void configure() {
+ bindSettings(BraveConf.class);
+ bindSettings(TracingConf.class);
+
+ bind(Key.get(Tracer.class, Names.named("noop")))
+ .toProvider(NoopTracerFactory::create);
+ bind(Key.get(Tracer.class, Names.named("brave")))
+ .toProvider(BraveTracerProvider.class);
+
+ bind(Key.get(Reporter.class, Names.named("console")))
+ .toProvider(() -> Reporter.CONSOLE);
+ bindTyped(Reporter.class, Slf4jReporter.class);
+ }
+
+ @Provides
+ @Singleton
+ @Named("http")
+ protected Reporter getHttpReporter(Settings settings) {
+ return AsyncReporter
+ .builder(URLConnectionSender.create(settings.getString(BraveConf.HTTP)))
+ .build();
+ }
+
+ @Provides
+ @Singleton
+ protected Reporter getReporter(Injector injector, Settings settings) {
+ return ImplLoader.get(injector, Reporter.class, settings, BraveConf.REPORTER);
+ }
+
+ @Provides
+ @Singleton
+ protected Tracer getTracer(Injector injector, Settings settings) {
+ return ImplLoader.get(injector, Tracer.class, settings, TracingConf.TRACER);
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/transformer/NoopContentDetector.java b/oxalis-commons/src/main/java/network/oxalis/commons/transformer/NoopContentDetector.java
new file mode 100644
index 0000000000000000000000000000000000000000..b3d0820fa0dfaa84f944a4af19cada07504f1a98
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/transformer/NoopContentDetector.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.transformer;
+
+import network.oxalis.api.lang.OxalisContentException;
+import network.oxalis.api.transformer.ContentDetector;
+import network.oxalis.api.util.Type;
+import network.oxalis.vefa.peppol.common.model.Header;
+
+import javax.inject.Singleton;
+import java.io.InputStream;
+
+/**
+ * @author erlend
+ * @since 4.0.1
+ */
+@Singleton
+@Type("noop")
+public class NoopContentDetector implements ContentDetector {
+
+ @Override
+ public Header parse(InputStream inputStream) throws OxalisContentException {
+ throw new OxalisContentException("Content does not contain SBDH.");
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/transformer/NoopContentWrapper.java b/oxalis-commons/src/main/java/network/oxalis/commons/transformer/NoopContentWrapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..ee8e54915ad907581f8a4db4c1828ec61e32004b
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/transformer/NoopContentWrapper.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.transformer;
+
+import com.google.inject.Singleton;
+import network.oxalis.api.lang.OxalisContentException;
+import network.oxalis.api.transformer.ContentWrapper;
+import network.oxalis.api.util.Type;
+import network.oxalis.vefa.peppol.common.model.Header;
+
+import java.io.InputStream;
+
+/**
+ * @author erlend
+ * @since 4.0.1
+ */
+@Singleton
+@Type("noop")
+public class NoopContentWrapper implements ContentWrapper {
+
+ @Override
+ public InputStream wrap(InputStream inputStream, Header header) throws OxalisContentException {
+ throw new OxalisContentException("No content wrapper is available.");
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/transformer/TransformerConf.java b/oxalis-commons/src/main/java/network/oxalis/commons/transformer/TransformerConf.java
new file mode 100644
index 0000000000000000000000000000000000000000..04a0c419beacefe81310ff6b5206bee75570a9c7
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/transformer/TransformerConf.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.transformer;
+
+import network.oxalis.api.settings.DefaultValue;
+import network.oxalis.api.settings.Path;
+import network.oxalis.api.settings.Title;
+
+/**
+ * @author erlend
+ * @since 4.0.1
+ */
+@Title("Transformer")
+public enum TransformerConf {
+
+ @Path("oxalis.transformer.detector")
+ @DefaultValue("noop")
+ DETECTOR,
+
+ @Path("oxalis.transformer.wrapper")
+ @DefaultValue("xml")
+ WRAPPER
+
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/transformer/TransformerModule.java b/oxalis-commons/src/main/java/network/oxalis/commons/transformer/TransformerModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..6995329a958a1e416bd592893c8142ea355c09a9
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/transformer/TransformerModule.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.transformer;
+
+import com.google.inject.Injector;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import network.oxalis.api.settings.Settings;
+import network.oxalis.api.transformer.ContentDetector;
+import network.oxalis.api.transformer.ContentWrapper;
+import network.oxalis.commons.guice.ImplLoader;
+import network.oxalis.commons.guice.OxalisModule;
+
+/**
+ * @author erlend
+ * @since 4.0.1
+ */
+public class TransformerModule extends OxalisModule {
+
+ @Override
+ protected void configure() {
+ bindTyped(ContentDetector.class, NoopContentDetector.class);
+ bindTyped(ContentWrapper.class, NoopContentWrapper.class);
+
+ bindSettings(TransformerConf.class);
+ }
+
+ @Provides
+ @Singleton
+ protected ContentDetector getContentDetector(Injector injector, Settings settings) {
+ return ImplLoader.get(injector, ContentDetector.class, settings, TransformerConf.DETECTOR);
+ }
+
+ @Provides
+ @Singleton
+ protected ContentWrapper getContentWrapper(Injector injector, Settings settings) {
+ return ImplLoader.get(injector, ContentWrapper.class, settings, TransformerConf.WRAPPER);
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/transmission/DefaultTransmissionVerifier.java b/oxalis-commons/src/main/java/network/oxalis/commons/transmission/DefaultTransmissionVerifier.java
new file mode 100644
index 0000000000000000000000000000000000000000..d9a59fdc8a1d8be2018b5b3885064dd3d4b68fea
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/transmission/DefaultTransmissionVerifier.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.transmission;
+
+import com.google.inject.Singleton;
+import network.oxalis.api.model.Direction;
+import network.oxalis.api.transmission.TransmissionVerifier;
+import network.oxalis.api.util.Type;
+import network.oxalis.vefa.peppol.common.model.Header;
+
+/**
+ * Default implementation allowing all incoming transmissions.
+ *
+ * @author erlend
+ * @since 4.0.0
+ */
+@Singleton
+@Type("default")
+public class DefaultTransmissionVerifier implements TransmissionVerifier {
+
+ @Override
+ public void verify(Header header, Direction direction) {
+ // No action.
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/transmission/TransmissionConf.java b/oxalis-commons/src/main/java/network/oxalis/commons/transmission/TransmissionConf.java
new file mode 100644
index 0000000000000000000000000000000000000000..faf1c6872f4aed8881e36ad7e57f6e133fdc12ca
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/transmission/TransmissionConf.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.transmission;
+
+import network.oxalis.api.settings.DefaultValue;
+import network.oxalis.api.settings.Path;
+import network.oxalis.api.settings.Title;
+
+/**
+ * @author erlend
+ */
+@Title("Transmission")
+public enum TransmissionConf {
+
+ @Path("oxalis.transmission.verifier")
+ @DefaultValue("default")
+ VERIFIER
+
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/transmission/TransmissionModule.java b/oxalis-commons/src/main/java/network/oxalis/commons/transmission/TransmissionModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..e20cfaf5eb5c383629636d2701fcbed0da60d625
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/transmission/TransmissionModule.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.transmission;
+
+import com.google.inject.Injector;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import network.oxalis.api.settings.Settings;
+import network.oxalis.api.transmission.TransmissionVerifier;
+import network.oxalis.commons.guice.ImplLoader;
+import network.oxalis.commons.guice.OxalisModule;
+
+/**
+ * @author erlend
+ * @since 4.0.0
+ */
+public class TransmissionModule extends OxalisModule {
+
+ @Override
+ protected void configure() {
+ bindSettings(TransmissionConf.class);
+
+ bindTyped(TransmissionVerifier.class, DefaultTransmissionVerifier.class);
+ }
+
+ @Provides
+ @Singleton
+ protected TransmissionVerifier getInboundVerifier(Injector injector, Settings settings) {
+ return ImplLoader.get(injector, TransmissionVerifier.class, settings, TransmissionConf.VERIFIER);
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/util/ClassUtils.java b/oxalis-commons/src/main/java/network/oxalis/commons/util/ClassUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..5c20c3e6e3fe4b779f41746f9fe4cc40e095eb24
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/util/ClassUtils.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.util;
+
+import network.oxalis.api.lang.OxalisLoadingException;
+
+/**
+ * @author erlend
+ */
+public class ClassUtils {
+
+ /**
+ * Loads a class from current class loader.
+ */
+ public static Class load(String className) {
+ return load(className, Thread.currentThread().getContextClassLoader());
+ }
+
+ /**
+ * Loads a class from the given class loader.
+ */
+ public static Class load(String className, ClassLoader classLoader) {
+ try {
+ return classLoader.loadClass(className);
+ } catch (ClassNotFoundException e) {
+ throw new OxalisLoadingException(String.format("Unable to load class '%s'.", classLoader), e);
+ }
+ }
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/util/OxalisVersion.java b/oxalis-commons/src/main/java/network/oxalis/commons/util/OxalisVersion.java
new file mode 100644
index 0000000000000000000000000000000000000000..8f1d977ad6faf7c51e915324f4836e4de7e8aeb4
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/util/OxalisVersion.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.util;
+
+import network.oxalis.api.lang.OxalisLoadingException;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+/**
+ * Provides access to selected Maven injected properties in the oxalis-version.properties file.
+ *
+ * @author steinar
+ * @author thore
+ * @author erlend
+ */
+public class OxalisVersion {
+
+ private static Properties properties;
+
+ static {
+ try (InputStream inputStream = OxalisVersion.class.getResourceAsStream("/oxalis-version.properties")) {
+ properties = new Properties();
+ properties.load(inputStream);
+ } catch (IOException e) {
+ throw new OxalisLoadingException(e.getMessage(), e);
+ }
+ }
+
+ /**
+ * The Oxalis version, taken from the POM
+ */
+ public static String getVersion() {
+ return properties.getProperty("oxalis.version");
+ }
+
+ /**
+ * The OS user (from environment) running the build
+ */
+ public static String getUser() {
+ return properties.getProperty("oxalis.user");
+ }
+
+ /**
+ * Describes the build SCM version
+ */
+ public static String getBuildDescription() {
+ return properties.getProperty("git.commit.id.describe");
+ }
+
+ /**
+ * Git SCM version, full format
+ */
+ public static String getBuildId() {
+ return properties.getProperty("git.commit.id");
+ }
+
+ /**
+ * The build commit time stamp
+ */
+ public static String getBuildTimeStamp() {
+ return properties.getProperty("git.commit.time");
+ }
+
+}
diff --git a/oxalis-commons/src/main/java/network/oxalis/commons/util/Sortables.java b/oxalis-commons/src/main/java/network/oxalis/commons/util/Sortables.java
new file mode 100644
index 0000000000000000000000000000000000000000..b6b19ddeb863d5bba3088c72af22e91f6b8184c2
--- /dev/null
+++ b/oxalis-commons/src/main/java/network/oxalis/commons/util/Sortables.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.util;
+
+import network.oxalis.api.util.Sort;
+
+import java.util.Comparator;
+
+/**
+ * Class containing methods to make Sortable interface and Sort
+ * annotation useful.
+ *
+ * @author erlend
+ */
+public class Sortables {
+
+ /**
+ * Method extracting order value from a given object.
+ *
+ * @param The type of the elements to be sorted.
+ * @param o Object to extract value for comparison.
+ * @return Value used to compare.
+ */
+ public static int extract(T o) {
+ if (o.getClass().isAnnotationPresent(Sort.class))
+ return o.getClass().getAnnotation(Sort.class).value();
+
+ return 0;
+ }
+
+ /**
+ * Returns a comparator.
+ *
+ * @param The type of the elements to be sorted.
+ * @return Comparator to be used for sorting.
+ */
+ public static Comparator comparator() {
+ return Comparator.comparingInt(Sortables::extract);
+ }
+}
\ No newline at end of file
diff --git a/oxalis-commons/src/main/resources/reference.conf b/oxalis-commons/src/main/resources/reference.conf
new file mode 100644
index 0000000000000000000000000000000000000000..938d752bcac1e068f8a70418f01d0f56706564c9
--- /dev/null
+++ b/oxalis-commons/src/main/resources/reference.conf
@@ -0,0 +1,21 @@
+oxalis.module.core = {
+ config.class = network.oxalis.commons.config.ConfigModule
+ error.class = network.oxalis.commons.error.ErrorModule
+ evidence.class = network.oxalis.commons.evidence.EvidenceModule
+ executor.class = network.oxalis.commons.executor.ExecutorModule
+ filesystem.class = network.oxalis.commons.filesystem.FileSystemModule
+ header.class = network.oxalis.commons.header.HeaderModule
+ http.class = network.oxalis.commons.http.ApacheHttpModule
+ identifier.class = network.oxalis.commons.identifier.IdentifierModule
+ logging.class = network.oxalis.commons.logging.LoggingModule
+ mode.class = network.oxalis.commons.mode.ModeModule
+ persist.class = network.oxalis.commons.persist.PersisterModule
+ plugin.class = network.oxalis.commons.plugin.PluginModule
+ security.class = network.oxalis.commons.security.CertificateModule
+ statistics.class = network.oxalis.commons.statistics.StatisticsModule
+ tag.class = network.oxalis.commons.tag.TagModule
+ timestamp.class = network.oxalis.commons.timestamp.TimestampModule
+ tracing.class = network.oxalis.commons.tracing.TracingModule
+ transformer.class = network.oxalis.commons.transformer.TransformerModule
+ transmission.class = network.oxalis.commons.transmission.TransmissionModule
+}
diff --git a/oxalis-commons/src/test/java/dk/erst/oxalis/commons/filesystem/detector/RelativePropertyHomeDetectorTest.java b/oxalis-commons/src/test/java/dk/erst/oxalis/commons/filesystem/detector/RelativePropertyHomeDetectorTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..ec4cbb449bb111342e95f811af7991b705e68a4e
--- /dev/null
+++ b/oxalis-commons/src/test/java/dk/erst/oxalis/commons/filesystem/detector/RelativePropertyHomeDetectorTest.java
@@ -0,0 +1,53 @@
+package dk.erst.oxalis.commons.filesystem.detector;
+
+import network.oxalis.api.filesystem.HomeDetector;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import java.io.File;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+
+public class RelativePropertyHomeDetectorTest {
+
+ private HomeDetector homeDetector = new RelativePropertyHomeDetector();
+
+ @BeforeClass
+ public void setup(){
+ System.setProperty("catalina.base", "/catalina");
+ }
+
+ @AfterClass
+ public void cleanup(){
+ System.clearProperty("catalina.base");
+ }
+
+ @Test
+ public void testFromJavaSystemProperty() {
+ String path = new File("/catalina/some/system/path2").getAbsolutePath();
+ String backup = System.getProperty(RelativePropertyHomeDetector.VARIABLE);
+
+ try {
+ System.clearProperty(RelativePropertyHomeDetector.VARIABLE);
+ File oxalis_home = homeDetector.detect();
+ assertNull(oxalis_home);
+
+ System.setProperty(RelativePropertyHomeDetector.VARIABLE, "");
+ oxalis_home = homeDetector.detect();
+ assertNull(oxalis_home);
+
+ System.setProperty(RelativePropertyHomeDetector.VARIABLE, "some/system/path2");
+ oxalis_home = homeDetector.detect();
+ assertEquals(oxalis_home.getAbsolutePath(), path);
+
+ System.setProperty(RelativePropertyHomeDetector.VARIABLE, "/some/system/path2");
+ oxalis_home = homeDetector.detect();
+ assertEquals(oxalis_home.getAbsolutePath(), path);
+ } finally {
+ if (backup == null) backup = ""; // prevent null pointer exception
+ System.setProperty(RelativePropertyHomeDetector.VARIABLE, backup);
+ }
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/bouncycastle/BCHelperTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/bouncycastle/BCHelperTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..c8e090c71db977d7940d243e8ec1045ab61afe45
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/bouncycastle/BCHelperTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.bouncycastle;
+
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.security.NoSuchAlgorithmException;
+import java.security.Provider;
+import java.security.Security;
+
+/**
+ * @author erlend
+ */
+public class BCHelperTest {
+
+ @Test
+ public void simpleConstructor() {
+ new BCHelper();
+ }
+
+ @Test
+ public void simpleRegisterProvider() {
+ if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) != null)
+ Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
+
+ Assert.assertNull(Security.getProvider(BouncyCastleProvider.PROVIDER_NAME));
+
+ BCHelper.registerProvider();
+
+ Provider provider = Security.getProvider(BouncyCastleProvider.PROVIDER_NAME);
+ Assert.assertNotNull(provider);
+
+ BCHelper.registerProvider();
+
+ Assert.assertTrue(provider == Security.getProvider(BouncyCastleProvider.PROVIDER_NAME));
+ }
+
+ @Test
+ public void createMessageDigest() throws Exception {
+ BCHelper.registerProvider();
+
+ Assert.assertNotNull(BCHelper.getMessageDigest("SHA-1"));
+ }
+
+ @Test(expectedExceptions = NoSuchAlgorithmException.class)
+ public void triggerExceptionWhenProviderIsNotFound() throws Exception {
+ Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
+
+ BCHelper.getMessageDigest("SHA-512");
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/commons/JavaPropertiesPostConfigTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/commons/JavaPropertiesPostConfigTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..df8137d6460124061de29e756f7de90d6cdcb9c0
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/commons/JavaPropertiesPostConfigTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.commons;
+
+import com.google.common.collect.ImmutableMap;
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+import network.oxalis.commons.config.JavaPropertiesPostConfig;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+public class JavaPropertiesPostConfigTest {
+
+ @Test
+ public void simple() {
+ Assert.assertNull(System.getProperty("oxalis.test"));
+
+ Config config = ConfigFactory.parseMap(ImmutableMap.of("oxalis.java.oxalis.test", "Value"));
+
+ new JavaPropertiesPostConfig().perform(config);
+
+ Assert.assertEquals(System.getProperty("oxalis.test"), "Value");
+
+ System.clearProperty("oxalis.test");
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/evidence/RemEvidenceFactoryTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/evidence/RemEvidenceFactoryTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..5180f566effb6884b306dddf791f39c9c8452c6b
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/evidence/RemEvidenceFactoryTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.evidence;
+
+import com.google.inject.Inject;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.api.evidence.EvidenceFactory;
+import network.oxalis.api.lang.EvidenceException;
+import network.oxalis.api.model.TransmissionIdentifier;
+import network.oxalis.api.outbound.TransmissionResponse;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import network.oxalis.test.identifier.PeppolDocumentTypeIdAcronym;
+import network.oxalis.vefa.peppol.common.code.DigestMethod;
+import network.oxalis.vefa.peppol.common.model.*;
+import org.mockito.Mockito;
+import org.testng.Assert;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Date;
+
+/**
+ * @author erlend
+ */
+@Slf4j
+@Guice(modules = {GuiceModuleLoader.class})
+public class RemEvidenceFactoryTest {
+
+ @Inject
+ private EvidenceFactory evidenceFactory;
+
+ @Test
+ public void simple() throws IOException, EvidenceException {
+ Assert.assertNotNull(evidenceFactory);
+
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ evidenceFactory.write(outputStream, createMockTransmissionResponse());
+
+ log.info(new String(outputStream.toByteArray()));
+ }
+
+ @Test(expectedExceptions = EvidenceException.class)
+ public void triggerException() throws IOException, EvidenceException {
+ evidenceFactory.write(null, createMockTransmissionResponse());
+ }
+
+ private TransmissionResponse createMockTransmissionResponse() {
+ TransmissionResponse transmissionResponse = Mockito.mock(TransmissionResponse.class);
+
+ Date timestamp = new Date();
+ Mockito.when(transmissionResponse.getTimestamp()).thenReturn(timestamp);
+
+ Header header = Header.newInstance()
+ .sender(ParticipantIdentifier.of("9908:987654321"))
+ .receiver(ParticipantIdentifier.of("9908:123456789"))
+ .documentType(PeppolDocumentTypeIdAcronym.INVOICE.toVefa())
+ .identifier(InstanceIdentifier.generateUUID());
+ Mockito.when(transmissionResponse.getHeader()).thenReturn(header);
+
+ Digest digest = Digest.of(DigestMethod.SHA1, "Hello World".getBytes());
+ Mockito.when(transmissionResponse.getDigest()).thenReturn(digest);
+
+ TransmissionIdentifier transmissionIdentifier = TransmissionIdentifier.generateUUID();
+ Mockito.when(transmissionResponse.getTransmissionIdentifier()).thenReturn(transmissionIdentifier);
+
+ Mockito.when(transmissionResponse.getTransportProtocol()).thenReturn(TransportProtocol.INTERNAL);
+
+ Mockito.when(transmissionResponse.getReceipts()).thenReturn(Collections.emptyList());
+
+ return transmissionResponse;
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/ClassLoaderUtilsTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/ClassLoaderUtilsTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..d20192f1d4a1a8c0b2f3cc01f8e9dcc07bc287ad
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/ClassLoaderUtilsTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.filesystem;
+
+import network.oxalis.api.lang.OxalisPluginException;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * @author erlend
+ */
+public class ClassLoaderUtilsTest {
+
+ private ClassLoader current = Thread.currentThread().getContextClassLoader();
+
+ @Test
+ public void simpleConstructor() {
+ new ClassLoaderUtils();
+ }
+
+ @Test
+ public void simpleNull() {
+ Assert.assertEquals(ClassLoaderUtils.initiate(null), current);
+ }
+
+ @Test
+ public void simpleJavaHome() {
+ Path path = Paths.get(System.getProperty("java.home"), "lib");
+ Assert.assertNotEquals(ClassLoaderUtils.initiate(path), current);
+ }
+
+ @Test
+ public void simpleRT() {
+ Path path = Paths.get(System.getProperty("java.home"), "lib", "rt.jar");
+ Assert.assertNotEquals(ClassLoaderUtils.initiate(path), current);
+ }
+
+ @Test(expectedExceptions = OxalisPluginException.class)
+ public void triggerException() {
+ Path path = Paths.get(System.getProperty("java.home"), "completely", "invalid", "folder");
+ ClassLoaderUtils.initiate(path);
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/FileSystemConfTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/FileSystemConfTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..7d3e312f27e0810e2ccb090d622ffb97a2bb3333
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/FileSystemConfTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.filesystem;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+public class FileSystemConfTest {
+
+ @Test
+ public void simpleValueOf() {
+ Assert.assertEquals(FileSystemConf.valueOf("CONF"), FileSystemConf.CONF);
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/FileSystemModuleTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/FileSystemModuleTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..5a86756b591a118e8d805830bdf6309455a2831d
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/FileSystemModuleTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.filesystem;
+
+import com.google.inject.Guice;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.name.Names;
+import com.google.inject.util.Modules;
+import network.oxalis.commons.config.ConfigModule;
+import network.oxalis.test.filesystem.TestFileSystemModule;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.nio.file.Path;
+
+public class FileSystemModuleTest {
+
+ @Inject
+ private Injector injector = Guice.createInjector(
+ new ConfigModule(),
+ Modules.override(new FileSystemModule()).with(new TestFileSystemModule()));
+
+ @Test
+ public void verifyHomeFolder() {
+ Assert.assertNotNull(injector.getInstance(Key.get(Path.class, Names.named("home"))));
+ }
+
+ @Test
+ public void verifyConfFolder() {
+ Assert.assertNotNull(injector.getInstance(Key.get(Path.class, Names.named("conf"))));
+ }
+
+ @Test
+ public void verifyInboundFolder() {
+ Assert.assertNotNull(injector.getInstance(Key.get(Path.class, Names.named("inbound"))));
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/FileUtilsTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/FileUtilsTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..6819615373846469cd9bcf8a47b80f0cece8ec58
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/FileUtilsTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.filesystem;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+public class FileUtilsTest {
+
+ @Test
+ public void simpleConstructor() {
+ new FileUtils();
+ }
+
+ @Test
+ public void simpleFilterString() {
+ String result = FileUtils.filterString("<1811836472.7.1486495191281.JavaMail.ebe@L-EBE-X260>");
+ Assert.assertEquals(result, "_1811836472.7.1486495191281.JavaMail.ebe_L-EBE-X260_");
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/OxalisHomeDirectoryTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/OxalisHomeDirectoryTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..a09a47941594d8744c4097aee959d64f05a267db
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/OxalisHomeDirectoryTest.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.filesystem;
+
+import com.google.inject.Inject;
+import network.oxalis.api.lang.OxalisLoadingException;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.Collections;
+
+/**
+ * @author steinar
+ * @author thore
+ * @author erlend
+ */
+@Guice(modules = GuiceModuleLoader.class)
+public class OxalisHomeDirectoryTest {
+
+ @Inject
+ private OxalisHomeDirectory oxalisHomeDirectory;
+
+ private Path fakeHome;
+
+ @BeforeClass
+ public void beforeClass() throws Exception {
+ this.fakeHome = new File(getClass().getResource("/oxalis_home/fake-oxalis.conf").toURI())
+ .toPath().getParent();
+ }
+
+ @Test
+ public void simple() {
+ Assert.assertNotNull(oxalisHomeDirectory);
+ }
+
+ @Test
+ public void mockingFound() {
+ OxalisHomeDirectory oxalisHomeDirectory = new OxalisHomeDirectory(
+ Collections.singletonList(() -> fakeHome.toFile()));
+
+ Assert.assertNotNull(oxalisHomeDirectory.detect());
+ }
+
+ @Test(expectedExceptions = OxalisLoadingException.class)
+ public void mockingNotFound() {
+ OxalisHomeDirectory oxalisHomeDirectory = new OxalisHomeDirectory(
+ Collections.singletonList(() -> null));
+ oxalisHomeDirectory.detect();
+ }
+
+ @Test(expectedExceptions = OxalisLoadingException.class)
+ public void mockingInvalid() {
+ OxalisHomeDirectory oxalisHomeDirectory = new OxalisHomeDirectory(
+ Collections.singletonList(() -> new File("/invalid")));
+ oxalisHomeDirectory.detect();
+ }
+
+ @Test(expectedExceptions = OxalisLoadingException.class)
+ public void mockingFile() {
+ OxalisHomeDirectory oxalisHomeDirectory = new OxalisHomeDirectory(
+ Collections.singletonList(() -> fakeHome.resolve("fake-oxalis.conf").toFile()));
+ oxalisHomeDirectory.detect();
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/detector/EnvironmentHomeDetectorTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/detector/EnvironmentHomeDetectorTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..589cfba7b9bb60692a3ba909ea4a0baabe3f021f
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/detector/EnvironmentHomeDetectorTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.filesystem.detector;
+
+import network.oxalis.api.filesystem.HomeDetector;
+import org.testng.annotations.Test;
+
+import java.util.Collections;
+
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+
+/**
+ * @author erlend
+ */
+public class EnvironmentHomeDetectorTest {
+
+ @Test
+ public void notFound() {
+ HomeDetector homeDetector = new EnvironmentHomeDetector(Collections.emptyMap());
+
+ assertNull(homeDetector.detect());
+ }
+
+ @Test
+ public void found() {
+ HomeDetector homeDetector = new EnvironmentHomeDetector(
+ Collections.singletonMap(EnvironmentHomeDetector.VARIABLE, "/tmp"));
+
+ assertNotNull(homeDetector.detect());
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/detector/JndiHomeDetectorTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/detector/JndiHomeDetectorTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..14282ff1b7715af702d2bb8f16e73a9b150cb79b
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/detector/JndiHomeDetectorTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.filesystem.detector;
+
+import network.oxalis.api.filesystem.HomeDetector;
+import org.testng.annotations.Test;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import java.io.File;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+
+/**
+ * @author erlend
+ */
+public class JndiHomeDetectorTest {
+
+ private HomeDetector homeDetector = new JndiHomeDetector();
+
+ @Test
+ public void testFromJndi() throws Exception {
+ System.setProperty(Context.INITIAL_CONTEXT_FACTORY, TestableInitialContextFactory.class.getName());
+ new InitialContext().unbind(JndiHomeDetector.VARIABLE);
+
+ String path = new File("/some/system/path1").getAbsolutePath();
+
+ //
+ File oxalis_home = homeDetector.detect();
+ assertNull(oxalis_home);
+
+ // bind value to JNDI and read
+ new InitialContext().bind(JndiHomeDetector.VARIABLE, path);
+ oxalis_home = homeDetector.detect();
+ assertEquals(oxalis_home.getAbsolutePath(), path);
+
+ // Removes the JNDI entry for OXALIS_HOME
+ new InitialContext().unbind(JndiHomeDetector.VARIABLE);
+ }
+
+ @Test
+ public void testEmpty() throws Exception {
+ System.setProperty(Context.INITIAL_CONTEXT_FACTORY, TestableInitialContextFactory.class.getName());
+ new InitialContext().unbind(JndiHomeDetector.VARIABLE);
+
+ File oxalis_home = homeDetector.detect();
+ assertNull(oxalis_home);
+
+ // bind value to JNDI and read
+ new InitialContext().bind(JndiHomeDetector.VARIABLE, "");
+ assertNull(homeDetector.detect());
+
+ // Removes the JNDI entry for OXALIS_HOME
+ new InitialContext().unbind(JndiHomeDetector.VARIABLE);
+ }
+
+ @Test
+ public void testNotSet() throws Exception {
+ System.clearProperty(Context.INITIAL_CONTEXT_FACTORY);
+
+ assertNull(homeDetector.detect());
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/detector/ProperyHomeDetectorTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/detector/ProperyHomeDetectorTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..a8ffb6a2575f8ff43f559ae99ae600ea18cf1c6f
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/detector/ProperyHomeDetectorTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.filesystem.detector;
+
+import network.oxalis.api.filesystem.HomeDetector;
+import org.testng.annotations.Test;
+
+import java.io.File;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+
+/**
+ * @author erlend
+ */
+public class ProperyHomeDetectorTest {
+
+ private HomeDetector homeDetector = new PropertyHomeDetector();
+
+ @Test
+ public void testFromJavaSystemProperty() {
+ String path = new File("/some/system/path2").getAbsolutePath();
+ String backup = System.getProperty(PropertyHomeDetector.VARIABLE);
+
+ try {
+ System.clearProperty(PropertyHomeDetector.VARIABLE);
+ File oxalis_home = homeDetector.detect();
+ assertNull(oxalis_home);
+
+ System.setProperty(PropertyHomeDetector.VARIABLE, "");
+ oxalis_home = homeDetector.detect();
+ assertNull(oxalis_home);
+
+ System.setProperty(PropertyHomeDetector.VARIABLE, path);
+ oxalis_home = homeDetector.detect();
+ assertEquals(oxalis_home.getAbsolutePath(), path);
+ } finally {
+ if (backup == null) backup = ""; // prevent null pointer exception
+ System.setProperty(PropertyHomeDetector.VARIABLE, backup);
+ }
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/detector/TestableInitialContextFactory.java b/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/detector/TestableInitialContextFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..d2289916b0809656fa25554a2211c9b7d758537a
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/detector/TestableInitialContextFactory.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.filesystem.detector;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.naming.spi.InitialContextFactory;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+
+/**
+ * Define a fake JNDI context factory, holding a scaled down Context with just enough power to make the test cases work.
+ *
+ * @author thore
+ */
+public class TestableInitialContextFactory implements InitialContextFactory {
+
+ private static Context context;
+
+ static {
+ try {
+ context = new InitialContext(true) {
+ Map bindings = new HashMap<>();
+
+ @Override
+ public void bind(String name, Object obj) {
+ bindings.put(name, obj);
+ }
+
+ @Override
+ public Object lookup(String name) {
+ return bindings.get(name);
+ }
+
+ @Override
+ public void unbind(String name) {
+ bindings.remove(name);
+ }
+
+ };
+ } catch (NamingException ex) {
+ throw new IllegalStateException(ex);
+ }
+ }
+
+ @Override
+ public Context getInitialContext(Hashtable environment) {
+ return context;
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/detector/UserHomeDetectorTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/detector/UserHomeDetectorTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..61e5a1d000a371f7dc322e3c406feb7d41bff701
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/filesystem/detector/UserHomeDetectorTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.filesystem.detector;
+
+import network.oxalis.api.filesystem.HomeDetector;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * @author erlend
+ */
+public class UserHomeDetectorTest {
+
+ private HomeDetector homeDetector = new UserHomeDetector();
+
+ private String backup;
+
+ @BeforeClass
+ public void beforeClass() {
+ backup = System.getProperty("user.home");
+ }
+
+ @AfterClass
+ public void afterClass() {
+ System.setProperty("user.home", backup);
+ }
+
+ @Test
+ public void valid() throws Exception {
+ Path path = Paths.get(getClass().getResource("/.oxalis").toURI()).getParent();
+ System.setProperty("user.home", path.toAbsolutePath().toString());
+
+ Assert.assertNotNull(homeDetector.detect());
+ }
+
+ @Test
+ public void invalid() {
+ System.setProperty("user.home", "/invalid");
+
+ Assert.assertNull(homeDetector.detect());
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/guice/GuiceModuleLoaderTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/guice/GuiceModuleLoaderTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..40e1ef8e65eca1ac8fe3a83b9c833f375355ef59
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/guice/GuiceModuleLoaderTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.guice;
+
+import org.testng.annotations.Test;
+
+public class GuiceModuleLoaderTest {
+
+ @Test
+ public void simpleConstructor() {
+ new GuiceModuleLoader();
+ }
+
+ @Test
+ public void simple() {
+ GuiceModuleLoader.initiate();
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/guice/GuiceServiceLoaderTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/guice/GuiceServiceLoaderTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..539e9803b2b9bfa4ca8d3f93c35a8ff09ece5084
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/guice/GuiceServiceLoaderTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.guice;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import network.oxalis.api.lang.OxalisLoadingException;
+import network.oxalis.api.persist.PayloadPersister;
+import network.oxalis.api.persist.ReceiptPersister;
+import network.oxalis.api.timestamp.TimestampProvider;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import java.util.List;
+
+/**
+ * @author erlend
+ */
+public class GuiceServiceLoaderTest {
+
+ private GuiceServiceLoader serviceLoader;
+
+ private ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+
+ @BeforeClass
+ public void beforeClass() {
+ Injector injector = Guice.createInjector();
+ serviceLoader = injector.getInstance(GuiceServiceLoader.class);
+ }
+
+ @Test
+ public void simple() {
+ List providers = serviceLoader.load(TimestampProvider.class, classLoader);
+
+ Assert.assertEquals(providers.size(), 1);
+ Assert.assertTrue(providers.get(0) instanceof SampleTimestampProvider);
+ }
+
+ @Test
+ public void noneDetected() {
+ Assert.assertEquals(serviceLoader.load(PayloadPersister.class, classLoader).size(), 0);
+ }
+
+ @Test(expectedExceptions = OxalisLoadingException.class)
+ public void triggerException() {
+ serviceLoader.load(ReceiptPersister.class, classLoader);
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/guice/SampleTimestampProvider.java b/oxalis-commons/src/test/java/network/oxalis/commons/guice/SampleTimestampProvider.java
new file mode 100644
index 0000000000000000000000000000000000000000..a262de9e38ef9f2b400598a49dae60db239a92ec
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/guice/SampleTimestampProvider.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.guice;
+
+import network.oxalis.api.lang.TimestampException;
+import network.oxalis.api.model.Direction;
+import network.oxalis.api.timestamp.Timestamp;
+import network.oxalis.api.timestamp.TimestampProvider;
+
+/**
+ * Class used by {@link GuiceServiceLoaderTest}.
+ *
+ * @author erlend
+ */
+public class SampleTimestampProvider implements TimestampProvider {
+
+ @Override
+ public Timestamp generate(byte[] content, Direction direction) throws TimestampException {
+ return null;
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/http/ApacheHttpModuleTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/http/ApacheHttpModuleTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..e7266215c347e2292e52a2e4c48f3fb25bc79628
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/http/ApacheHttpModuleTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.http;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.testng.Assert;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+
+@Guice(modules = {GuiceModuleLoader.class})
+public class ApacheHttpModuleTest {
+
+ @Inject
+ private Provider httpClientProvider;
+
+ @Test
+ public void simple() throws IOException {
+ try (CloseableHttpClient httpClient1 = httpClientProvider.get();
+ CloseableHttpClient httpClient2 = httpClientProvider.get()) {
+
+ Assert.assertNotNull(httpClient1);
+ Assert.assertNotNull(httpClient2);
+
+ Assert.assertNotSame(httpClient1, httpClient2);
+ }
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/http/HttpConfTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/http/HttpConfTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..33c278b442bcf5f716600e8a9274dfe1548fda7f
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/http/HttpConfTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.http;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+public class HttpConfTest {
+
+ @Test
+ public void simpleValueOf() {
+ Assert.assertEquals(HttpConf.valueOf("POOL_TOTAL"), HttpConf.POOL_TOTAL);
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/io/PeekingInputStreamTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/io/PeekingInputStreamTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..96160d3a9a9ec042dd07e56775ccadcb399c8aea
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/io/PeekingInputStreamTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.io;
+
+import com.google.common.io.ByteStreams;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+public class PeekingInputStreamTest {
+
+ @Test
+ public void simple() throws IOException {
+ PeekingInputStream peekingInputStream = new PeekingInputStream(
+ new ByteArrayInputStream("Hello World!".getBytes()));
+
+ byte[] bytes1 = new byte[5];
+ peekingInputStream.read(bytes1);
+ Assert.assertEquals(new String(bytes1), "Hello");
+
+ Assert.assertEquals(new String(ByteStreams.toByteArray(peekingInputStream.newInputStream())), "Hello World!");
+ }
+}
+
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/io/UnclosableInputStreamTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/io/UnclosableInputStreamTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..02e88b9e7047496acd2382e854d31867dc6ffa0f
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/io/UnclosableInputStreamTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.io;
+
+import com.google.common.io.ByteStreams;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class UnclosableInputStreamTest {
+
+ @Test
+ public void simple() throws IOException {
+ InputStream inputStream = new ByteArrayInputStream("Hello World!".getBytes());
+
+ try (InputStream content = new UnclosableInputStream(inputStream)) {
+ ByteStreams.exhaust(content);
+ } // close() is called here.
+
+ Assert.assertEquals(inputStream.read(), -1);
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/logging/LogbackConfiguratorTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/logging/LogbackConfiguratorTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..9c830102cb6d23b1b660f6260b50c1cb56c5c98c
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/logging/LogbackConfiguratorTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.logging;
+
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import java.io.PrintStream;
+
+/**
+ * User: steinar
+ * Date: 04.10.12
+ * Time: 13:42
+ */
+@Guice(modules = {GuiceModuleLoader.class})
+public class LogbackConfiguratorTest {
+
+ public static final String FILE_NAME = "logback-test.xml";
+
+ private PrintStream out;
+
+ @BeforeMethod
+ public void redirectStdoutAndStderr() {
+ out = System.out;
+ }
+
+ @AfterTest
+ public void restoreOutputStreams() {
+ System.setOut(out);
+ }
+
+ @Test
+ public void locateConfigurationFileInClassPath() {
+ // TODO
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/logging/LoggingConfTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/logging/LoggingConfTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..a7bffa8c13f4085523149e820a7bc71a4c37f160
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/logging/LoggingConfTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.logging;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+public class LoggingConfTest {
+
+ @Test
+ public void simpleValueOf() {
+ Assert.assertEquals(LoggingConf.valueOf("CONFIG"), LoggingConf.CONFIG);
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/mode/ModeModuleTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/mode/ModeModuleTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..ce01a4e2639abc25e9092fe11f2b43c676810734
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/mode/ModeModuleTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.mode;
+
+import com.google.inject.Inject;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import network.oxalis.vefa.peppol.common.code.Service;
+import network.oxalis.vefa.peppol.security.api.CertificateValidator;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import java.security.cert.X509Certificate;
+
+@Guice(modules = {GuiceModuleLoader.class})
+public class ModeModuleTest {
+
+ @Inject
+ private CertificateValidator certificateValidator;
+
+ @Inject
+ private X509Certificate certificate;
+
+ @Test
+ public void simple() throws Exception {
+ certificateValidator.validate(Service.AP, certificate);
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/persister/DefaultPersisterHandlerTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/persister/DefaultPersisterHandlerTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..6c67974a18f38f34436e372852187f89b2cb087a
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/persister/DefaultPersisterHandlerTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.persister;
+
+import com.google.inject.Inject;
+import network.oxalis.api.persist.PersisterHandler;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import org.testng.Assert;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+@Guice(modules = GuiceModuleLoader.class)
+public class DefaultPersisterHandlerTest {
+
+ @Inject
+ private PersisterHandler persisterHandler;
+
+ @Test
+ public void simple() {
+ Assert.assertNotNull(persisterHandler);
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/persister/DefaultPersisterTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/persister/DefaultPersisterTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..7f8c1ca101bdbb46f3852d9cb53a3a8686efd44b
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/persister/DefaultPersisterTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.persister;
+
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+import network.oxalis.api.persist.PayloadPersister;
+import network.oxalis.api.persist.ReceiptPersister;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import org.testng.Assert;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+@Guice(modules = GuiceModuleLoader.class)
+public class DefaultPersisterTest {
+
+ @Inject
+ @Named("default")
+ private PayloadPersister payloadPersister;
+
+ @Inject
+ @Named("default")
+ private ReceiptPersister receiptPersister;
+
+ @Test
+ public void simple() {
+ Assert.assertNotNull(payloadPersister);
+ Assert.assertNotNull(receiptPersister);
+ }
+
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/persister/NoopPersisterTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/persister/NoopPersisterTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..b37987d685ab26b010b8711b4a5d39b0c6ff5c6d
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/persister/NoopPersisterTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.persister;
+
+import network.oxalis.commons.persist.NoopPersister;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayInputStream;
+
+/**
+ * @author erlend
+ */
+public class NoopPersisterTest {
+
+ private NoopPersister persister = new NoopPersister();
+
+ @Test
+ public void simple() throws Exception {
+ Assert.assertNull(persister.persist(null, null, new ByteArrayInputStream("Hello World".getBytes())));
+ persister.persist(null, null);
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/persister/TempPersisterTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/persister/TempPersisterTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..79dd285177306a86970fb2a06a00d70067ed88f6
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/persister/TempPersisterTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.persister;
+
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+import network.oxalis.api.persist.PayloadPersister;
+import network.oxalis.api.persist.ReceiptPersister;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import org.testng.Assert;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+@Guice(modules = GuiceModuleLoader.class)
+public class TempPersisterTest {
+
+ @Inject
+ @Named("temp")
+ private PayloadPersister payloadPersister;
+
+ @Inject
+ @Named("temp")
+ private ReceiptPersister receiptPersister;
+
+ @Test
+ public void simple() {
+ Assert.assertNotNull(payloadPersister);
+ Assert.assertNotNull(receiptPersister);
+ }
+
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/plugin/PluginTestModule.java b/oxalis-commons/src/test/java/network/oxalis/commons/plugin/PluginTestModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..4bbec81b39b656f8340f0f3c4b17fb71f77ad6cc
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/plugin/PluginTestModule.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.plugin;
+
+import com.google.inject.Inject;
+import network.oxalis.api.lang.OxalisPluginException;
+import network.oxalis.api.persist.PayloadPersister;
+import network.oxalis.api.plugin.PluginFactory;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+/**
+ * @author steinar
+ * Date: 24.01.2017
+ * Time: 10.45
+ * @author erlend
+ */
+@Guice(modules = {GuiceModuleLoader.class})
+public class PluginTestModule {
+
+ @Inject
+ private PluginFactory pluginFactory;
+
+ @Test(expectedExceptions = OxalisPluginException.class)
+ public void pluginNotFound() throws Exception {
+ pluginFactory.newInstance(PayloadPersister.class);
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/sbdh/SbdhHeaderParserTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/sbdh/SbdhHeaderParserTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..6eb5e71b19c21e0cd8227889a8b9128034ced495
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/sbdh/SbdhHeaderParserTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.sbdh;
+
+import network.oxalis.api.header.HeaderParser;
+import network.oxalis.api.lang.OxalisContentException;
+import network.oxalis.commons.header.SbdhHeaderParser;
+import network.oxalis.vefa.peppol.common.model.Header;
+import org.testng.annotations.Test;
+
+import java.io.InputStream;
+
+import static org.testng.Assert.assertNull;
+
+/**
+ * @author steinar
+ * Date: 24.06.15
+ * Time: 15.58
+ */
+public class SbdhHeaderParserTest {
+
+ public static final String EHF_INVOICE_NO_SBDH_XML = "/ehf-invoice-no-sbdh.xml";
+
+ private static final HeaderParser PARSER = new SbdhHeaderParser();
+
+ @Test
+ public void simpleConstructor() {
+ new SbdhHeaderParser();
+ }
+
+ @Test(expectedExceptions = OxalisContentException.class)
+ public void parseXmlFileWithoutSBDH() throws OxalisContentException {
+ InputStream resourceAsStream = getClass().getResourceAsStream(EHF_INVOICE_NO_SBDH_XML);
+
+ Header sbdh = PARSER.parse(resourceAsStream);
+ assertNull(sbdh);
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/security/CertificateUtilsTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/security/CertificateUtilsTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..3c160d6b235e68f981e4638b8b7ac9447bc92761
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/security/CertificateUtilsTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.security;
+
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+public class CertificateUtilsTest {
+
+ @Test
+ public void simpleConstructor() {
+ new CertificateUtils();
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/security/KeyStoreConfTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/security/KeyStoreConfTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..a9569bf479d36d913b16889b42c9cb319411edb3
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/security/KeyStoreConfTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.security;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+public class KeyStoreConfTest {
+
+ @Test
+ public void simpleValueOf() {
+ Assert.assertEquals(KeyStoreConf.valueOf("PATH"), KeyStoreConf.PATH);
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/settings/SettingsTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/settings/SettingsTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..80ae0486ce199b950e54c2f7da14f6504f1f5f8e
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/settings/SettingsTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.settings;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.inject.CreationException;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.util.Types;
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+import network.oxalis.api.settings.Path;
+import network.oxalis.api.settings.Settings;
+import network.oxalis.api.settings.Title;
+import network.oxalis.commons.guice.OxalisModule;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+public class SettingsTest {
+
+ private Injector injector;
+
+ private Settings settings;
+
+ private static final int INT_VALUE = 200;
+
+ @BeforeClass
+ @SuppressWarnings("unchecked")
+ public void beforeClass() {
+ injector = Guice.createInjector(new OxalisModule() {
+ @Override
+ protected void configure() {
+ SettingsBuilder.with(binder(), TestConf.class);
+
+ bind(Config.class).toInstance(ConfigFactory.parseMap(
+ ImmutableMap.of("test.value", String.valueOf(INT_VALUE))));
+ }
+ });
+
+ settings = injector.getInstance((Key>)
+ Key.get(Types.newParameterizedType(Settings.class, TestConf.class)));
+ }
+
+ @Test
+ public void simple() {
+ Assert.assertEquals(settings.getInt(TestConf.WITH_VALUE), INT_VALUE);
+ Assert.assertEquals(settings.getString(TestConf.WITH_DEFAULT), "Test");
+ Assert.assertNull(settings.getString(TestConf.WITH_NULLABLE));
+ Assert.assertEquals("Test", settings.getNamed(TestConf.WITH_DEFAULT).value());
+ }
+
+ /**
+ * Make sure exception is triggered if required configuration is not found.
+ */
+ @Test(expectedExceptions = CreationException.class)
+ public void invalidKey() {
+ injector.createChildInjector(new OxalisModule() {
+ @Override
+ protected void configure() {
+ SettingsBuilder.with(binder(), TestWithErrorConf.class);
+ }
+ });
+ }
+
+ @Title("Testing without valid key")
+ public enum TestWithErrorConf {
+
+ @Path("oxalis.common.testing.invalid.key")
+ KEY
+
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/settings/TestConf.java b/oxalis-commons/src/test/java/network/oxalis/commons/settings/TestConf.java
new file mode 100644
index 0000000000000000000000000000000000000000..14ccdd1072243308ec1d8c43cde3165f7c59b3d3
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/settings/TestConf.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.settings;
+
+import network.oxalis.api.settings.DefaultValue;
+import network.oxalis.api.settings.Nullable;
+import network.oxalis.api.settings.Path;
+import network.oxalis.api.settings.Title;
+
+/**
+ * @author erlend
+ */
+@Title("Testing")
+public enum TestConf {
+
+ @Path("test.nullable")
+ @Nullable
+ WITH_NULLABLE,
+
+ @Path("test.default")
+ @DefaultValue("Test")
+ WITH_DEFAULT,
+
+ @Path("test.value")
+ WITH_VALUE,
+
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/statistics/NoopStatisticsServiceTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/statistics/NoopStatisticsServiceTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..4a6f1106382d29efa4e390da31622685c4658422
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/statistics/NoopStatisticsServiceTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.statistics;
+
+import network.oxalis.api.statistics.StatisticsService;
+import org.testng.annotations.Test;
+
+public class NoopStatisticsServiceTest {
+
+ private StatisticsService statisticsService = new NoopStatisticsService();
+
+ @Test
+ public void simple() {
+ statisticsService.persist(null, null, null);
+ statisticsService.persist(null);
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/statistics/StatisticsConfTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/statistics/StatisticsConfTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..d44ebfd99bcf4235c1522fee8bafbd0a8bc2e147
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/statistics/StatisticsConfTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.statistics;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+public class StatisticsConfTest {
+
+ @Test
+ public void simpleValueOf() {
+ Assert.assertEquals(StatisticsConf.valueOf("SERVICE"), StatisticsConf.SERVICE);
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/statistics/StatisticsModuleTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/statistics/StatisticsModuleTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..66547fff5f9231bdc7782a155ae395a85b5b3765
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/statistics/StatisticsModuleTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.statistics;
+
+import com.google.inject.Inject;
+import network.oxalis.api.statistics.StatisticsService;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import org.testng.Assert;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+@Guice(modules = GuiceModuleLoader.class)
+public class StatisticsModuleTest {
+
+ @Inject
+ private StatisticsService statisticsService;
+
+ @Test
+ public void simple() {
+ Assert.assertNotNull(statisticsService);
+ }
+
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/timestamp/SystemTimestampProviderTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/timestamp/SystemTimestampProviderTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..da153ad7941d6a9e210d9e7eeca53bc1551c9791
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/timestamp/SystemTimestampProviderTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.timestamp;
+
+import com.google.inject.Inject;
+import io.opentracing.Tracer;
+import network.oxalis.api.model.Direction;
+import network.oxalis.api.timestamp.Timestamp;
+import network.oxalis.api.timestamp.TimestampProvider;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import org.testng.Assert;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+@Guice(modules = {GuiceModuleLoader.class})
+public class SystemTimestampProviderTest {
+
+ @Inject
+ private TimestampProvider timestampProvider;
+
+ @Inject
+ private Tracer tracer;
+
+ @Test
+ public void simpleWithoutTracer() throws Exception {
+ Timestamp timestamp = timestampProvider.generate("Hello World!".getBytes(), Direction.IN);
+
+ Assert.assertNotNull(timestamp.getDate());
+ Assert.assertFalse(timestamp.getReceipt().isPresent());
+ }
+
+ @Test
+ public void simpleWithTracer() throws Exception {
+ Timestamp timestamp = timestampProvider.generate("Hello World!".getBytes(), Direction.IN,
+ tracer.buildSpan("test").start());
+
+ Assert.assertNotNull(timestamp.getDate());
+ Assert.assertFalse(timestamp.getReceipt().isPresent());
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/timestamp/TimestampConfTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/timestamp/TimestampConfTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..22c4666590227fdb992c22d0ba86cbe6ef929494
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/timestamp/TimestampConfTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.timestamp;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+public class TimestampConfTest {
+
+ @Test
+ public void simpleValueOf() {
+ Assert.assertEquals(TimestampConf.valueOf("SERVICE"), TimestampConf.SERVICE);
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/tracing/Slf4jReporterTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/tracing/Slf4jReporterTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..5cc5a0ab6f9a04a8893c27d4cb206bceb5d3dc2e
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/tracing/Slf4jReporterTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.tracing;
+
+import org.testng.annotations.Test;
+
+public class Slf4jReporterTest {
+
+ @Test
+ public void simple() {
+ new Slf4jReporter().report(null);
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/tracing/TraceableTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/tracing/TraceableTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..368e29bb8de5aad7c4163ba54cc9910c3a8cbe41
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/tracing/TraceableTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.tracing;
+
+import io.opentracing.Tracer;
+import io.opentracing.noop.NoopTracerFactory;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class TraceableTest {
+
+ @Test
+ public void simple() {
+ Tracer tracer = NoopTracerFactory.create();
+
+ Traceable traceable = new Traceable(tracer) {
+ };
+
+ Assert.assertTrue(tracer == traceable.tracer);
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/transmission/DefaultTransmissionVerifierTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/transmission/DefaultTransmissionVerifierTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..059364be97e6b0f75095b9a829d159680db9d6ee
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/transmission/DefaultTransmissionVerifierTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.transmission;
+
+import com.google.inject.Inject;
+import network.oxalis.api.lang.VerifierException;
+import network.oxalis.api.model.Direction;
+import network.oxalis.api.transmission.TransmissionVerifier;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import org.testng.Assert;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+@Guice(modules = GuiceModuleLoader.class)
+public class DefaultTransmissionVerifierTest {
+
+ @Inject
+ private TransmissionVerifier transmissionVerifier;
+
+ @Test
+ public void simple() throws VerifierException {
+ Assert.assertNotNull(transmissionVerifier);
+ transmissionVerifier.verify(null, Direction.IN);
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/util/ClassUtilsTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/util/ClassUtilsTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..ee093d3947548c3b5c9b38fab43ed24590ac593e
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/util/ClassUtilsTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.util;
+
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+public class ClassUtilsTest {
+
+ @Test
+ public void simpleConstructor() {
+ new ClassUtils();
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/util/OxalisVersionTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/util/OxalisVersionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..7424e70694e04b4578d034dcb897b08ec8051727
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/util/OxalisVersionTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.util;
+
+import lombok.extern.slf4j.Slf4j;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertNotNull;
+
+/**
+ * @author steinar
+ * Date: 10.04.13
+ * Time: 10:50
+ */
+@Slf4j
+public class OxalisVersionTest {
+
+ @Test
+ public void simpleConstructor() {
+ new OxalisVersion();
+ }
+
+ @Test
+ public void simple() {
+ assertNotNull(OxalisVersion.getVersion());
+ assertNotNull(OxalisVersion.getUser());
+ assertNotNull(OxalisVersion.getBuildDescription());
+ assertNotNull(OxalisVersion.getBuildId());
+ assertNotNull(OxalisVersion.getBuildTimeStamp());
+ }
+
+ @Test
+ public void testGetVersion() throws Exception {
+ String currentVersion = OxalisVersion.getVersion();
+ assertNotNull(currentVersion);
+ log.info("Current version is '{}'.", currentVersion);
+ }
+
+ @Test
+ public void testGetBuildDescription() throws Exception {
+ String buildDescription = OxalisVersion.getBuildDescription();
+ assertNotNull(buildDescription);
+ log.info("Description is '{}'.", buildDescription);
+ }
+
+ @Test
+ public void testBuildTimeStamp() {
+ String buildTimeStamp = OxalisVersion.getBuildTimeStamp();
+ assertNotNull(buildTimeStamp, "Build time stamp not set");
+ log.info("Build time stamp is '{}'.", buildTimeStamp);
+ }
+}
diff --git a/oxalis-commons/src/test/java/network/oxalis/commons/util/SortablesTest.java b/oxalis-commons/src/test/java/network/oxalis/commons/util/SortablesTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..de4a8a2d22da7b092e6f981cf2925b7a72c27afa
--- /dev/null
+++ b/oxalis-commons/src/test/java/network/oxalis/commons/util/SortablesTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.commons.util;
+
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+public class SortablesTest {
+
+ @Test
+ public void simpleConstructor() {
+ new Sortables();
+ }
+}
diff --git a/oxalis-commons/src/test/resources/.oxalis/.gitkeep b/oxalis-commons/src/test/resources/.oxalis/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/oxalis-commons/src/test/resources/META-INF/services/network.oxalis.api.persist.ReceiptPersister b/oxalis-commons/src/test/resources/META-INF/services/network.oxalis.api.persist.ReceiptPersister
new file mode 100644
index 0000000000000000000000000000000000000000..443d9ab34e6d126f5a03cea379ee410a83960d8d
--- /dev/null
+++ b/oxalis-commons/src/test/resources/META-INF/services/network.oxalis.api.persist.ReceiptPersister
@@ -0,0 +1 @@
+some.test.Class
\ No newline at end of file
diff --git a/oxalis-commons/src/test/resources/META-INF/services/network.oxalis.api.timestamp.TimestampProvider b/oxalis-commons/src/test/resources/META-INF/services/network.oxalis.api.timestamp.TimestampProvider
new file mode 100644
index 0000000000000000000000000000000000000000..5d6b6a9d67e1a0dabd12c0c955550ef71d6ba133
--- /dev/null
+++ b/oxalis-commons/src/test/resources/META-INF/services/network.oxalis.api.timestamp.TimestampProvider
@@ -0,0 +1 @@
+network.oxalis.commons.guice.SampleTimestampProvider
\ No newline at end of file
diff --git a/oxalis-commons/src/test/resources/difi-smp-result.xml b/oxalis-commons/src/test/resources/difi-smp-result.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0b48b018d4f53c1bb1e55ff0f65cfe308ccca81c
--- /dev/null
+++ b/oxalis-commons/src/test/resources/difi-smp-result.xml
@@ -0,0 +1,67 @@
+
+
+9908:810418052urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol5a:ver1.0::2.0urn:www.cenbii.eu:profile:bii05:ver1.0https://test-aksesspunkt.difi.no/as2true12013-11-08T01:00:00.000+01:002015-11-08T01:00:00.000+01:00MIIEYzCCA0ugAwIBAgIQdsW7SZfoTYtho20e1yuuXTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQG
+EwJESzEnMCUGA1UEChMeTkFUSU9OQUwgSVQgQU5EIFRFTEVDT00gQUdFTkNZMR8wHQYDVQQLExZG
+T1IgVEVTVCBQVVJQT1NFUyBPTkxZMSQwIgYDVQQDExtQRVBQT0wgQUNDRVNTIFBPSU5UIFRFU1Qg
+Q0EwHhcNMTQxMTMwMDAwMDAwWhcNMTYxMTI5MjM1OTU5WjA1MQswCQYDVQQGEwJOTzENMAsGA1UE
+CgwERElGSTEXMBUGA1UEAwwOQVBQXzEwMDAwMDAwMDUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDWKst/fUruM6MsOsFeoH57wpxPzvm9vfQIu4jtmmGxrJQCx4Ddici7gPWblFwSoJhj
+p2jee0ck/BFGGXa/FFMLh30AfdgFRSSrriwV7p45PyqzMJM63lg2vb2OYRV4uDZRp7dCBgdNOXsP
+LeSyJUGFqbAEFhcw3sDNTrF0WkDysKwX/KiNDcCrOXbhhKweawrxp6N4ayupCbhzd/MAOqbSaSTg
+8jysLPRs80LRFfLt88oiBcJxRBQzbkedU9e3WFs0UnzEdkQn2Ea6YKyXKtK/GbaetBrYbH2sAtYo
+RnqEKls1fsFNicPJnmjwePc8R+hNOXWUTwGGxJvuG91uCLdXAgMBAAGjggElMIIBITAJBgNVHRME
+AjAAMAsGA1UdDwQEAwIDuDB2BgNVHR8EbzBtMGugaaBnhmVodHRwOi8vcGlsb3RvbnNpdGVjcmwu
+dmVyaXNpZ24uY29tL0RpZ2l0YWxpc2VyaW5nc3N0eXJlbHNlblBpbG90T3BlblBFUFBPTEFDQ0VT
+U1BPSU5UQ0EvTGF0ZXN0Q1JMLmNybDAfBgNVHSMEGDAWgBT3losZTK7iViEAvob9ekesncoFdTAd
+BgNVHQ4EFgQUbc5WCBfsQS2KkznlkU83EtHvb7MwOgYIKwYBBQUHAQEELjAsMCoGCCsGAQUFBzAB
+hh5odHRwOi8vcGlsb3Qtb2NzcC52ZXJpc2lnbi5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJ
+KoZIhvcNAQELBQADggEBAAHzziSeejvdFuQQfYTsHq8cqPBxHXHmD783HFIhEJ0PEBbI8IGGsolp
+W3DeKzmteK3SmrLYNoKRoGi3bklIRlujTSt8fwvMrEFAbQ4o14/OFXvp3NA6heOKhzU4Lqh3DGGW
+z/bVbZnl/nDQ8ynm4MeJvzqksfsyXlTpWTf64NgOZ2ntZq/ifbbISk5kRqKiX2zC/0RNe+Cwdj+q
+aJQvwE2MwmauGABolFH/dUTjECZY23Ho4CcIa1NzvAp25S2w9rn8/FfBEdcnVnzXAlBEU3bCBcfG
+2m0+Cy6Y8C5OI0mF83Xa/sYS86Ie+jZPRc1L9LYIhhD3gU8/7fZ3DvMFFPk=Access point for testingaksesspunkt@difi.noERhE31+o810iHOh9vqmbRrR6/ys=kqJN0jekn+ksDklaldoHdE5tgS1CNTE73+gaV66drkTjZJ6cuwMfQGVqxbdniwVwesSZOIiaZJV+
+JCDsSL6qq2FIo7qmp5zklDlNaGZzkyPOQH+DzCASQ2Vpd0Bg4IKYjH6tXww5UM1oogco6V7OOxfg
+TddB21KlF+vaWsvkh64srzHHb43giOcki1cGE0wtH2BSzqsd97SI3enb9cIrsrTxgCHze+6KBXaQ
+ybIfydqr4gjvfB/wlENPaZPpskKDzEEdcaDpzhwCBUyUKdXaIBehllk24kc30+CWSUbJIYDd7eHa
++umV0r/I6vHSo+AKox8ry0iugDYt+UCW83Estw==CN=SMP_1000000005,O=DIFI,C=NOMIIEgDCCA2igAwIBAgIQMrLCi6vy9yCkE4koH/oh5zANBgkqhkiG9w0BAQsFADCBizELMAkGA1UE
+BhMCREsxJzAlBgNVBAoTHk5BVElPTkFMIElUIEFORCBURUxFQ09NIEFHRU5DWTEfMB0GA1UECxMW
+Rk9SIFRFU1QgUFVSUE9TRVMgT05MWTEyMDAGA1UEAxMpUEVQUE9MIFNFUlZJQ0UgTUVUQURBVEEg
+UFVCTElTSEVSIFRFU1QgQ0EwHhcNMTQxMTMwMDAwMDAwWhcNMTYxMTI5MjM1OTU5WjA1MQswCQYD
+VQQGEwJOTzENMAsGA1UECgwERElGSTEXMBUGA1UEAwwOU01QXzEwMDAwMDAwMDUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCszgRipz35U32rbjCqdfHDYbiMqx5CF4Fs66hwpDUXwTay
+qANvbIHo0+RW69opD9tm5Y7Gx+f0jjzYC5QOlHVXpTOPJwdozaJgqlJrlTvgktqYD1bOo+7d6ORS
+szfEZSTAKRE3N3BvaTvIecDvo8UKHrFQEwdOu1tvJxN0pt9/PyFpByGMh8xJS6ThcEyePDI4PTsH
+5hEzi/XLBuX0ZM6Uc0MTkyOIKzPtI//0eBFBGOzTtAXT/hclpUbX6qDhbbtnDfD+Agti45fqotb7
+TrmNGwqNepks1kEsvNVNA0ui+1zIsMlp/hL/xHdKS9Ar+ozkia2iU6qJLYFPbHy+4NZ5AgMBAAGj
+ggEzMIIBLzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDuDCBgwYDVR0fBHwwejB4oHagdIZyaHR0cDov
+L3BpbG90b25zaXRlY3JsLnZlcmlzaWduLmNvbS9EaWdpdGFsaXNlcmluZ3NzdHlyZWxzZW5QaWxv
+dE9wZW5QRVBQT0xTRVJWSUNFTUVUQURBVEFQVUJMSVNIRVJDQS9MYXRlc3RDUkwuY3JsMB8GA1Ud
+IwQYMBaAFODHhUA1Ov0c8/Zewh8w0PJkoQJ3MB0GA1UdDgQWBBRRGp0gAxOFHgEhOdEg0/tZHMjB
+qDA6BggrBgEFBQcBAQQuMCwwKgYIKwYBBQUHMAGGHmh0dHA6Ly9waWxvdC1vY3NwLnZlcmlzaWdu
+LmNvbTATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAV3eQPNF71xQtwc8C
+GdcIsahP3iVmqEpQH2av5gkKNBLqMjwZ+i8h1tjZPZyfG54C7tTpMeH7XwS/sEO6Xhc48HabreLt
+lDAzGv4kjQPHQJvOdkNrBn4wOC7bZag5DO6lDAKVsSwBJbhHJL9uI2EPSqrI/H7mSj9exAwi15FW
+Y3HeEay6p+47DMdt3V1pZ1hyYVAuUCVkPqdV0g9ADHjCdHRAn73KXqJHM6siMp7ekWo+poCmwiMC
+tV0oro/6G/aIdDXxDVE37HogaBA8MqyeQL9KTx7VfXjqWi1bHWJlbzvmnQCjCqtPklch3VbI9V0r
+Y7WcmklvEl3flp7lJd9FAw==
\ No newline at end of file
diff --git a/oxalis-commons/src/test/resources/ehf-invoice-no-sbdh.xml b/oxalis-commons/src/test/resources/ehf-invoice-no-sbdh.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cafbc9aff063b36ccab7881fd40227d1ca02227f
--- /dev/null
+++ b/oxalis-commons/src/test/resources/ehf-invoice-no-sbdh.xml
@@ -0,0 +1,289 @@
+
+
+
+
+
+
+ 2.0
+
+ urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0#urn:www.difi.no:ehf:faktura:ver1
+
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ 3456
+ 2013-11-05
+ Levering: NAV HMS Nord-Trøndelag - Kikrkegata 2 C - 7600 Levanger
+ NOK
+
+ 1671018
+
+
+
+ 9908:991974466
+
+ Comfort Audio AS
+
+
+ Postboks 304
+ SANDEFJORD
+ 3201
+
+ NO
+
+
+
+ 991974466MVA
+
+
+ VAT
+
+
+
+ Comfort Audio AS
+ 991974466
+
+
+ 3462
+ 95987910
+ alexander.delgado@comfortaudio.com
+
+
+
+
+
+ 9908:889640782
+
+ 10019
+
+
+ NAV Økonomitjeneste
+
+
+ Sognefjordveien 56
+ LEIKANGER
+ 6863
+
+ NO
+
+
+
+ NAV Økonomitjeneste
+ 889640782
+
+
+ SRA4711
+
+
+
+
+ 2013-11-05
+
+
+ Sognefjordveien 56
+ LEIKANGER
+ 6863
+
+ NO
+
+
+
+
+
+ 31
+ 2013-12-05
+
+ 60210741723
+
+
+
+
+ 4105.00
+
+ 16420.00
+ 4105.00
+
+ S
+ 25.00
+
+ VAT
+
+
+
+
+
+ 16420.00
+ 16420.00
+ 20525.00
+ 0.00
+ 20525.00
+
+
+
+ 1
+ 1.00
+ 5890.00
+
+ Comfort Digisystem DM10 (HMS nr. 160723)
+
+ F00209
+
+
+ S
+ 25.00
+
+ VAT
+
+
+
+
+ 5890.00
+
+
+
+
+ 2
+ 1.00
+ 425.00
+
+ Veske Digisystem (HMS nr. 161381)
+
+ F00493
+
+
+ S
+ 25.00
+
+ VAT
+
+
+
+
+ 425.00
+
+
+
+
+ 3
+ 1.00
+ 190.00
+
+ Nettadapter A11 1-2 enheter (HMS nr. 161752)
+
+ F00359
+
+
+ S
+ 25.00
+
+ VAT
+
+
+
+
+ 190.00
+
+
+
+
+ 4
+ 1.00
+ 1795.00
+
+ Hodebøylemikrofon (HMS nr. 161759)
+
+ F00243
+
+
+ S
+ 25.00
+
+ VAT
+
+
+
+
+ 1795.00
+
+
+
+
+ 5
+ 2.00
+ 950.00
+
+ Ladestativ DM/DH (HMS nr. 161760)
+
+ F00254
+
+
+ S
+ 25.00
+
+ VAT
+
+
+
+
+ 475.00
+
+
+
+
+ 6
+ 1.00
+ 7170.00
+
+ Comfort Digisystem DM90 m/BT (HMS nr. 193853)
+
+ F00684
+
+
+ S
+ 25.00
+
+ VAT
+
+
+
+
+ 7170.00
+
+
+
diff --git a/oxalis-commons/src/test/resources/logback-oxalis-inbound.xml b/oxalis-commons/src/test/resources/logback-oxalis-inbound.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9ba0de5fc0e2ef9287cc084396a4efa80f319e31
--- /dev/null
+++ b/oxalis-commons/src/test/resources/logback-oxalis-inbound.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+ %d %p [%c] %m %n
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oxalis-commons/src/test/resources/logback-test.xml b/oxalis-commons/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9ba0de5fc0e2ef9287cc084396a4efa80f319e31
--- /dev/null
+++ b/oxalis-commons/src/test/resources/logback-test.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+ %d %p [%c] %m %n
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oxalis-commons/src/test/resources/oxalis-web.properties b/oxalis-commons/src/test/resources/oxalis-web.properties
new file mode 100644
index 0000000000000000000000000000000000000000..1aaa909e1816cb868129585e483eac523acbf53f
--- /dev/null
+++ b/oxalis-commons/src/test/resources/oxalis-web.properties
@@ -0,0 +1,27 @@
+#
+# Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+#
+# Licensed under the EUPL, Version 1.1 or – as soon they
+# will be approved by the European Commission - subsequent
+# versions of the EUPL (the "Licence");
+#
+# You may not use this work except in compliance with the Licence.
+#
+# You may obtain a copy of the Licence at:
+#
+# https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+#
+# Unless required by applicable law or agreed to in
+# writing, software distributed under the Licence is
+# distributed on an "AS IS" basis,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+# express or implied.
+# See the Licence for the specific language governing
+# permissions and limitations under the Licence.
+#
+
+#
+# Test version of oxalis-web.properties
+#
+oxalis.inbound.message.store TEST
+oxalis.keystore TEST-KEY-STORE
\ No newline at end of file
diff --git a/oxalis-commons/src/test/resources/oxalis_home/fake-oxalis.conf b/oxalis-commons/src/test/resources/oxalis_home/fake-oxalis.conf
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/oxalis-commons/src/test/resources/oxalis_home/logback-test.xml b/oxalis-commons/src/test/resources/oxalis_home/logback-test.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9ba0de5fc0e2ef9287cc084396a4efa80f319e31
--- /dev/null
+++ b/oxalis-commons/src/test/resources/oxalis_home/logback-test.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+ %d %p [%c] %m %n
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oxalis-commons/src/test/resources/peppol-bis-invoice-sbdh.xml b/oxalis-commons/src/test/resources/peppol-bis-invoice-sbdh.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9881f31d5e31663225451cede9c5e11b8112b7fc
--- /dev/null
+++ b/oxalis-commons/src/test/resources/peppol-bis-invoice-sbdh.xml
@@ -0,0 +1,150 @@
+
+
+
+ 1.0
+
+ 0007:5567125082
+
+
+ 0007:4455454480
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2
+ 2.0
+ 1070e7f0-3bae-11e3-aa6e-0800200c9a66
+ Invoice
+ 2013-02-19T05:10:10
+
+
+
+ DOCUMENTID
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+
+
+ PROCESSID
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+
+
+
+
+ 2.0
+ urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ 1
+ 2012-06-08
+ 380
+ 2012-06-08
+ SEK
+ SOPE
+
+
+
+ 5567125082
+
+
+ Ecru Consulting
+
+
+ Gamla Brogatan
+ 29
+ Stockholm
+ 11120
+
+ SE
+
+
+
+ SE556712508201
+
+ VAT
+
+
+
+ 810418052
+
+
+ Martin
+ Forsberg
+
+
+
+
+
+
+ 4455454480
+
+
+ EKONOMISTYRNINGSVERKET (NATIONAL FINANCIAL MANAGEMENT AUTHORITY)
+
+
+ 45316
+ EFFEKTIV ADMINISTRATION
+ STOCKHOLM
+ 104 30
+
+ SE
+
+
+
+ 976098897
+
+
+ 08 - 123456
+ 08-123457
+ infomail@esv.se
+
+
+ SOREN
+ PEDERSEN
+
+
+
+
+ 31
+ 2012-06-23
+
+ 5955559
+
+
+ BGABSESS
+
+
+
+
+
+ 0.25
+
+ 1
+ 0.25
+
+ S
+ 25
+
+ VAT
+
+
+
+
+
+ 1
+ 1
+ 1.25
+ 1.25
+
+
+ 1
+ 1
+ 1
+
+ 1
+
+
+ TEST AV PEPPOL-FAKTURA
+
+
+ 1
+ 1
+
+
+
+
diff --git a/oxalis-commons/src/test/resources/reference.conf b/oxalis-commons/src/test/resources/reference.conf
new file mode 100644
index 0000000000000000000000000000000000000000..ca3af1f6a24b7efef9fb638d6edde338932bd5ee
--- /dev/null
+++ b/oxalis-commons/src/test/resources/reference.conf
@@ -0,0 +1 @@
+defaults = {}
diff --git a/oxalis-commons/src/test/resources/sample-sbd-with-asic.xml b/oxalis-commons/src/test/resources/sample-sbd-with-asic.xml
new file mode 100644
index 0000000000000000000000000000000000000000..234bbb9e3fc53bee183c4ba5537566ccf00d6514
--- /dev/null
+++ b/oxalis-commons/src/test/resources/sample-sbd-with-asic.xml
@@ -0,0 +1,154 @@
+
+
+
+ 1.0
+
+ 9908:810018909
+
+
+ 9908:810418052
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Tender-2
+ 2.1
+ FA4A6819-6149-4134-95C3-C53A65338EB6
+ Tender
+ 2015-07-26T20:08:00+01:00
+
+
+ 1
+
+ application/vnd.etsi.asic-e+zip
+ #asic
+ ASiC archive containing the business documents.
+
+
+
+
+ PROCESSID
+ urn:www.cenbii.eu:profile:bii46:ver3.0
+
+
+ DOCUMENTID
+
+ urn:oasis:names:specification:ubl:schema:xsd:Tender-2::Tender##urn:www.cenbii.eu:transaction:biitrdm090:ver3.0::2.1
+
+
+
+
+
+ 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
+ QS1JTkYvbWFuaWZlc3QueG1srZHBasMwDIbveQrj63CS3jaTtLc9wfYAaqyuBls2llKSPf2clMFg
+ MHqYbhK/vv8XGk5LDOqGhX2iUR/aXiukKTlPH6N+f3s1z1qxADkIiXDUK7I+HZuB+GAjkL8gi6oM
+ YltHo54L2QTsawsR2cpkU0ZyaZojkti79HvTbobHRtXaiRcf0FRZWdXeziGYDHIddaf3SUTnwcia
+ axTIOfgJpCbvbuRaFPZttZ4MPn36rLuHwHx217am+pu/CR7jSXGxf+kNz+foxUi9HYthiDngf/rc
+ iaYguIitLPIbLLhIlwN42phD9/Nnx+YLUEsHCFuZArnqAAAA+wEAAFBLAQIKAAoAAAgAAI1ZMEeK
+ IflFHwAAAB8AAAAIAAAAKAAAAAAAAAAAAAAAAABtaW1ldHlwZW1pbWV0eXBlPWFwcGxpY2F0aW9u
+ L3ZuZC5ldHNpLmFzaWMtZSt6aXBQSwECFAAUAAgICACNWTBH1R7KSasEAADfCwAACAAAAAAAAAAA
+ AAAAAABFAAAAc2JkaC54bWxQSwECFAAUAAgICACNWTBHqhrKndAGAABLEwAAIAAAAAAAAAAAAAAA
+ AAAmBQAAdHJkbTA5MC1zdWJtaXQtdGVuZGVyLXNhbXBsZS54bWxQSwECFAAUAAgICACNWTBHGHwq
+ qDcAAAA5AAAAEQAAAAAAAAAAAAAAAABEDAAAc2FtcGxlLXJlYWRtZS50eHRQSwECFAAUAAgICACN
+ WTBHjEPERu8BAABwBAAAGQAAAAAAAAAAAAAAAAC6DAAATUVUQS1JTkYvYXNpY21hbmlmZXN0Lnht
+ bFBLAQIUABQACAgIAI1ZMEeS19UY5gUAAGEHAAA7AAAAAAAAAAAAAAAAAPAOAABNRVRBLUlORi9z
+ aWduYXR1cmUtNGFjMjIwYTUtYzVkMi00YmFlLTliZmItODVhNjdhMDY3ZTZjLnA3c1BLAQIUABQA
+ CAgIAI1ZMEdbmQK56gAAAPsBAAAVAAAAAAAAAAAAAAAAAD8VAABNRVRBLUlORi9tYW5pZmVzdC54
+ bWxQSwUGAAAAAAcABwAUAgAAbBYAACgAbWltZXR5cGU9YXBwbGljYXRpb24vdm5kLmV0c2kuYXNp
+ Yy1lK3ppcA==
+
+
+
diff --git a/oxalis-commons/src/test/resources/sample-stats-response.xml b/oxalis-commons/src/test/resources/sample-stats-response.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9fa68e231e59ff78f049359d8a51931e6245718f
--- /dev/null
+++ b/oxalis-commons/src/test/resources/sample-stats-response.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+ AP0001
+ IN
+ 2013-01-29T13
+ 9908:810418052
+ CH1
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ 123
+
+
+ AP0001
+ IN
+ 2013-01-29T13
+ 9908:810418052
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ 321
+
+
+ xledger
+ OUT
+ 2013-04-17T02
+ 9908:880526642
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0#urn:www.difi.no:ehf:faktura:ver1::2.0
+ urn:www.cenbii.eu:profile:bii05:ver1.0
+
+ 1
+
+
+
\ No newline at end of file
diff --git a/oxalis-commons/src/test/resources/smp-response-for-971033533.xml b/oxalis-commons/src/test/resources/smp-response-for-971033533.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9fe23d8c983e4aa1b111d0fc0ddfc96132145ad2
--- /dev/null
+++ b/oxalis-commons/src/test/resources/smp-response-for-971033533.xml
@@ -0,0 +1,43 @@
+9908:971033533urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biitrns010:ver2.0:extended:urn:www.peppol.eu:bis:peppol4a:ver2.0:extended:urn:www.difi.no:ehf:faktura:ver2.0::2.1urn:www.cenbii.eu:profile:bii04:ver2.0https://peppol.itella.net/peppol-ap-inbound/as2false12013-03-01Z2022-03-01ZMIIEPjCCAyagAwIBAgIQbrlUH4LjKvChN2dbzWpkIjANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQG
+EwJESzEnMCUGA1UEChMeTkFUSU9OQUwgSVQgQU5EIFRFTEVDT00gQUdFTkNZMR8wHQYDVQQDExZQ
+RVBQT0wgQUNDRVNTIFBPSU5UIENBMB4XDTEzMTAyMjAwMDAwMFoXDTE1MTAyMjIzNTk1OVowQzEL
+MAkGA1UEBhMCRkkxFzAVBgNVBAMMDkFQUF8xMDAwMDAwMDIxMRswGQYDVQQKDBJJdGVsbGEgSW5m
+b3JtYXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw0JBmkDm2GXKwQRKOrjEr
+yRSdxDJBsO4lozQ/IthaTj+2UYZqS6umouYaD5/Ig6f43LlrtmhgViQN95+2IDcdF2X5H93joDUt
+M2JgwwSrSy//IBdVJgdIOY0LW+pGSIBaN4WbkZ0UkpPOyuW/2JPggwhxIghfyiJqm6ThLc6nz67z
+FwRcFj+Kua/1FZ6APMVq+WE2vKvnMF0JToZxVlyi5CyGBKXDW9uJWneK+6idiztlQ91Z+6Jl2Phs
+csNo3chT5N+L9vXX+bSgKhkv9OBPODK1k+x+4+P9Mh9rJLg2AgyNIeXd1iLcnmknERrmRpfigbMz
+5ECpNZqlTJrL1fJhAgMBAAGjggEYMIIBFDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDuDBsBgNVHR8E
+ZTBjMGGgX6BdhltodHRwOi8vb25zaXRlY3JsLnZlcmlzaWduLmNvbS9EaWdpdGFsaXNlcmluZ3Nz
+dHlyZWxzZW5PcGVuUEVQUE9MQUNDRVNTUE9JTlRDQS9MYXRlc3RDUkwuY3JsMB8GA1UdIwQYMBaA
+FE32PgBQKIZtNaD872aq+iKhJNuNMB0GA1UdDgQWBBQmvMVXU7zzLpX8yi7wNoeaLJozmjA3Bggr
+BgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly9wa2ktb2NzcC5zeW1hdXRoLmNvbTATBgNV
+HSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEASncvgkVR10IpjuwzIDuZDWS+KKya
+ccIa+FOCzaJ/w0seHmOqOztOmMIVenKc7ORXK3yljCO/8WmS8WDNX/ATyH2OfHfN5dsRUGcUAsiE
+W0jdg72zVH2XxZ5whsWumxEIR+PhSFuH/Wm9GjH9gUUYNpwD0TvgOZfTFXJouorLpx6hPMUa6FuD
+7L9pZ3Rk9JUarAdZ+NZIPCThrsJgrNGfaM0uXQ5lyNtnqLuaEtrvSPKejf7tWnhM6TERnCt2P/zJ
+6YmtGUTZOErefLoWsBFSMzC3uzXySceI+ymn1AL7tvBwCvk6s7iF80/ecO5iyqPzbglldRXZ311g
+vHe48x5EiQ==OpusCapita AP servicesinfo.no@itella.comrEMb2qN2G0OJAK1ZOSHt/Zt1ki4=FoQczfHqywR48FPkb2Mi0L8iUwWZaOjgXC06RO0NO8CiEk17ZNvwTd3t17J1IUVpPL/Ui+mjGU5w
+pCGeiCAhHn5Cp4ddBz6n0/Mgi4Y56u9bx0088MeRFiGSdRbIdYrn1mynRhmBpkKHNk9cU6uuMmua
+U8TzhQQ/bmm/v8nc/5NENoDQb/UC03ty7456ZuuMVUAtknDFkj5yaLveVevrT2+9mFBH5w7loJYE
+Do81PmvPejEofKzqTwq+antj4FPwnposjIc0EOJfCByGMpwYtpfv9Yh1/WE3ywFPdUeuB8/o18hW
+DnOFSjyyw8/YYFoIwI2k/5ZrNfsbytcOLGHhnQ==O=DIFI,CN=SMP_2000000105,C=NOMIIESzCCAzOgAwIBAgIQUu6qu0V/C1UfCp6umaq1VTANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
+EwJESzEnMCUGA1UEChMeTkFUSU9OQUwgSVQgQU5EIFRFTEVDT00gQUdFTkNZMS0wKwYDVQQDEyRQ
+RVBQT0wgU0VSVklDRSBNRVRBREFUQSBQVUJMSVNIRVIgQ0EwHhcNMTUwNDEzMDAwMDAwWhcNMTcw
+NDEyMjM1OTU5WjA1MQswCQYDVQQGEwJOTzEXMBUGA1UEAwwOU01QXzIwMDAwMDAxMDUxDTALBgNV
+BAoMBERJRkkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCp4ktGxC8ZYoSgjXI0e79N
+aYMeSNBR0/qCWkucx3AXxL4KPCV+oKHoQEO+7mi1Bj8nKBDql08v1dHWT6yF+IZkKREB8GBPon2P
+35r3J0VXPCAgTmQ9IezG7r0JAPueIn6VCHkYKtPAHhDyNZLaNwNRkVcF9jsJQf2M63/1vY8srohV
+tQ/9mogFpe9DN8DTf47flENqn2gT70dGXm9+XSRh0JfWjb5NqtMVe06/33ON9VAisqzPNS50qcPH
+PkwMB8uuKBT0pYh6u7XZ1N6xWla6HHCM/ksDZGI8MzMDCVeb14n5SwC/dQayjFf+Xv+hEzY0aKIt
+3DS4eE2bD78isSmfAgMBAAGjggElMIIBITAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDuDB5BgNVHR8E
+cjBwMG6gbKBqhmhodHRwOi8vb25zaXRlY3JsLnZlcmlzaWduLmNvbS9EaWdpdGFsaXNlcmluZ3Nz
+dHlyZWxzZW5PcGVuUEVQUE9MU0VSVklDRU1FVEFEQVRBUFVCTElTSEVSQ0EvTGF0ZXN0Q1JMLmNy
+bDAfBgNVHSMEGDAWgBR5y7W0EOuUtfV6wKwuVaHbijffFDAdBgNVHQ4EFgQUOhoCtatRUFglqARw
+aBqhJW3GDCcwNwYIKwYBBQUHAQEEKzApMCcGCCsGAQUFBzABhhtodHRwOi8vcGtpLW9jc3Auc3lt
+YXV0aC5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAKMNFsNLVJeq
+3jDv1QxdzMqHkpIUKC91Y4DHUAD9VVLjo5gk1XGd4BzasxvzGiwQmtcgBr0Uy5T54VdcfJIGcQ5D
+QPszNz5kT6it0sSawIGsJUm1h4+NCOoF15mT5/i1DpGiYuPoJBpB2XI2YknOgCHtneW4zxskzk0F
+7FgShSvrfl6VScipCHarNpB7aBGuPRMNBOLotym2J+Fb9zG/XJo2pcWkox5ZHZqt9uMht4qFCZG5
+RcUG2rf3q97WSvDFHtq31DYAxx9yNjiGNTo3KywNiLhMIZBDEND6tJ5XCQGPMI49V8Pc8Ikea+4q
+kQpEYQQJsEAVfh2nQAnWJtKxaS0=
\ No newline at end of file
diff --git a/oxalis-commons/src/test/resources/smp-response-with-as2.xml b/oxalis-commons/src/test/resources/smp-response-with-as2.xml
new file mode 100644
index 0000000000000000000000000000000000000000..175eba5ee9063abed1096f7586699217db5e3dde
--- /dev/null
+++ b/oxalis-commons/src/test/resources/smp-response-with-as2.xml
@@ -0,0 +1,118 @@
+
+
+
+
+
+
+ 9908:991825827
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0#urn:www.difi.no:ehf:faktura:ver1::2.0
+
+
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+
+
+
+ https://ap.ergogroup.no/oxalis/as2
+
+
+
+ false
+ 1
+ 2012-03-16T00:00:00Z
+ 2014-02-28T00:00:00Z
+ MIIEMzCCAxugAwIBAgIQU05M5k6dpbee1puonWt5vzANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQG
+ EwJESzEnMCUGA1UEChMeTkFUSU9OQUwgSVQgQU5EIFRFTEVDT00gQUdFTkNZMR8wHQYDVQQDExZQ
+ RVBQT0wgQUNDRVNTIFBPSU5UIENBMB4XDTEzMTAxNzAwMDAwMFoXDTE1MTAxNzIzNTk1OVowODEL
+ MAkGA1UEBhMCTk8xFzAVBgNVBAMMDkFQUF8xMDAwMDAwMDI1MRAwDgYDVQQKDAdFVlJZIEFTMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArHQ6z7INUf2+9NvLV0NvmMg4HDk8fVAh+Hvy
+ wLAXRzSvpefszhz5eQAmd5fxuQfOyevHGBiopU+mVspqSn1CyuD2eYUYG29djgSmIOQlqaj9Ixk4
+ aF0hYmDvyWyyw4PfzDT3j8ur+TYhtEegzUYbWbN2r6ZVcA85kEfssr70JxwVqS7y3IXX+r5r5/vY
+ 3SyUhDQbftG75yeVnj/1AvityfSTTjMlloWRAyDlue+vo+uyKj2zfueUhyWZaxq5EMjgHguDVqIg
+ I74uY5Ho/DIb0A2mEm6urXtk+XxsgMz18zEebD6eH/dFTV7PqraPFAyn866EcT8CWYubvf86XnUo
+ /wIDAQABo4IBGDCCARQwCQYDVR0TBAIwADALBgNVHQ8EBAMCA7gwbAYDVR0fBGUwYzBhoF+gXYZb
+ aHR0cDovL29uc2l0ZWNybC52ZXJpc2lnbi5jb20vRGlnaXRhbGlzZXJpbmdzc3R5cmVsc2VuT3Bl
+ blBFUFBPTEFDQ0VTU1BPSU5UQ0EvTGF0ZXN0Q1JMLmNybDAfBgNVHSMEGDAWgBRN9j4AUCiGbTWg
+ /O9mqvoioSTbjTAdBgNVHQ4EFgQU/0So1rHiz4+sceK7P18eVpnBhjgwNwYIKwYBBQUHAQEEKzAp
+ MCcGCCsGAQUFBzABhhtodHRwOi8vcGtpLW9jc3Auc3ltYXV0aC5jb20wEwYDVR0lBAwwCgYIKwYB
+ BQUHAwIwDQYJKoZIhvcNAQELBQADggEBAImyiGHjqEb9Jql2J7ITBmdm6c22E3y5xrR0Ib1UPvYV
+ 7ETQHj/BrCZkSEqJz5akPoEmqHeWDomMYdJLxFQyEqX2gmErggHQZ/PqROZ13TG2f5AuMBmN57H3
+ hXs3TAMpNnk24uGDLSRLkV8JOsZkIYXd+ykKzU4xfxEQe98UWOsgabwt8e6Ak4AJ3T1wpN/YyP+8
+ oQ0lsQ6ZbuWbTf5cPUNO5VwYLEnJKYgDMxJEcx0BfzOXpcTt9EGcm7QRPowIAEXvfXU7mPdwJif6
+ Y8sUbyqRYoG8b1ItBMsTD92ESdKpZzY6AafzSlRkLkD/bBxAqjYuL7RA9poFa5YA4bHSRrM=
+ Aksesspunkt for EEGs meldingssentral
+ leveranse@ergogroup.no
+ www.edbergogroup.no
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +I/JnSsqMlpm2YZWWZikUz10ZQI=
+
+
+ 0Tl9Fyt/DH2UeIdRocU8/OnDWTruaivmbQnbRkInQ0kBRjrrDO1816OHN6pO5z+lSe3lByb7d0FM
+ 8HF34YVFAJtmzCJ1Bdd9a60C1eTyRaHvkBV0k6M0epPR9hE/6ci0YMtVDTTAq72XJ7xM+3LS77Ca
+ jq8wbODl2LSZb5AiRmAU6YciurCqGbD3Ti1lbn/F/vmlLuRDD3yd//KM2S0fTGAB47Oym+V+0fja
+ gTfbHFFHs+ADvxnu7m7WXK6B9Klh/+WCMwYOIdkzzdSeM60Ge4l1LNMZwpdkTQOtVAq8wxtJgm/g
+ dhdNp+nGmStQ/ztW0UBAXxCo6UnP9e34e3P0ww==
+
+
+ O=Agency for Public Management and eGovernment (DIFI),CN=SMP_2000000005,C=NO
+ MIIEejCCA2KgAwIBAgIQUZcLJS2IyAyxZzsMNqh5UTANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
+ EwJESzEnMCUGA1UEChMeTkFUSU9OQUwgSVQgQU5EIFRFTEVDT00gQUdFTkNZMS0wKwYDVQQDEyRQ
+ RVBQT0wgU0VSVklDRSBNRVRBREFUQSBQVUJMSVNIRVIgQ0EwHhcNMTMwNDE4MDAwMDAwWhcNMTUw
+ NDE4MjM1OTU5WjBkMQswCQYDVQQGEwJOTzEXMBUGA1UEAwwOU01QXzIwMDAwMDAwMDUxPDA6BgNV
+ BAoMM0FnZW5jeSBmb3IgUHVibGljIE1hbmFnZW1lbnQgYW5kIGVHb3Zlcm5tZW50IChESUZJKTCC
+ ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN23HvOaLOcYOi4gTlX1ElVi7joQla/Km9yL
+ k57W8cdfmPu2I6GTo14rO7SSjEEq+m2p0pmNrmCWICstBy3/v9/EvCHW3vDv8xS1UcImwypvRguR
+ 1ATACiR5NeKPUbifjRGUx2rdj3BGnQxb3peDuMDwLifQE/KQxVoyeAyB64th2bUidTuEQRxWPiag
+ 5F556UWZyYXrwja5K0Lj8PVDQ8F099EQBQ5p/6/x/DAZBiukc293Z3UyE2b6JskgVeY2MGhpRYtT
+ 1eelLcGvH+jn6Ehs1c6GcJJFE2vxdwwmyET5J/t2+iJrjsq9pNymZySFtix6JiXhliPm2AkGR501
+ jK0CAwEAAaOCASUwggEhMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgO4MHkGA1UdHwRyMHAwbqBsoGqG
+ aGh0dHA6Ly9vbnNpdGVjcmwudmVyaXNpZ24uY29tL0RpZ2l0YWxpc2VyaW5nc3N0eXJlbHNlbk9w
+ ZW5QRVBQT0xTRVJWSUNFTUVUQURBVEFQVUJMSVNIRVJDQS9MYXRlc3RDUkwuY3JsMB8GA1UdIwQY
+ MBaAFHnLtbQQ65S19XrArC5VoduKN98UMB0GA1UdDgQWBBQ0CizSDL8+dfT85fLEtXr/SeMIBzA3
+ BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly9wa2ktb2NzcC5zeW1hdXRoLmNvbTAT
+ BgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAVNmOc+OhdDhlFEIKjXMvUPeq
+ h8ln15scrn0OhjHW2wreD5+x7zwLjsA7N1KV4+QzSFQS9AskY7ESpyuM0Zpqjr62f+3VgFg+hLWY
+ A++u75lg+Sr34fCUpXBJlM43hbNE9jva5HvmfG0k23Ez+WdjTLSDfIkIYcZUa60ZBrlAbgcnauRW
+ oDYLw77GBrfSkVCGgt+81lVWyZm9vQMX5zf2NZk3x9Crlqdo26L0WWJEd+cgppR9PHuS/8CJpf7M
+ hnOfFDG5NvkPwVIxSFTgAhwDxRgYCCJhXlJmuMtUCmTMmzvCxJ2MDMTdimswVgZiAWr/IIiqHcsv
+ LRzT3bMAGFE1ZQ==
+
+
+
+
diff --git a/oxalis-commons/src/test/resources/smp-response-with-unknown-protocol.xml b/oxalis-commons/src/test/resources/smp-response-with-unknown-protocol.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a874f2a06862895160329b8a9bfe4fc0d0c7bd12
--- /dev/null
+++ b/oxalis-commons/src/test/resources/smp-response-with-unknown-protocol.xml
@@ -0,0 +1,163 @@
+
+
+
+
+ 9908:991825827
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0#urn:www.difi.no:ehf:faktura:ver1::2.0
+
+
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+
+
+
+ https://ap.ergogroup.no/oxalis/accessPointService
+
+
+
+ false
+ 1
+ 2012-03-16T00:00:00Z
+ 2014-02-28T00:00:00Z
+ MIIEMzCCAxugAwIBAgIQU05M5k6dpbee1puonWt5vzANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQG
+ EwJESzEnMCUGA1UEChMeTkFUSU9OQUwgSVQgQU5EIFRFTEVDT00gQUdFTkNZMR8wHQYDVQQDExZQ
+ RVBQT0wgQUNDRVNTIFBPSU5UIENBMB4XDTEzMTAxNzAwMDAwMFoXDTE1MTAxNzIzNTk1OVowODEL
+ MAkGA1UEBhMCTk8xFzAVBgNVBAMMDkFQUF8xMDAwMDAwMDI1MRAwDgYDVQQKDAdFVlJZIEFTMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArHQ6z7INUf2+9NvLV0NvmMg4HDk8fVAh+Hvy
+ wLAXRzSvpefszhz5eQAmd5fxuQfOyevHGBiopU+mVspqSn1CyuD2eYUYG29djgSmIOQlqaj9Ixk4
+ aF0hYmDvyWyyw4PfzDT3j8ur+TYhtEegzUYbWbN2r6ZVcA85kEfssr70JxwVqS7y3IXX+r5r5/vY
+ 3SyUhDQbftG75yeVnj/1AvityfSTTjMlloWRAyDlue+vo+uyKj2zfueUhyWZaxq5EMjgHguDVqIg
+ I74uY5Ho/DIb0A2mEm6urXtk+XxsgMz18zEebD6eH/dFTV7PqraPFAyn866EcT8CWYubvf86XnUo
+ /wIDAQABo4IBGDCCARQwCQYDVR0TBAIwADALBgNVHQ8EBAMCA7gwbAYDVR0fBGUwYzBhoF+gXYZb
+ aHR0cDovL29uc2l0ZWNybC52ZXJpc2lnbi5jb20vRGlnaXRhbGlzZXJpbmdzc3R5cmVsc2VuT3Bl
+ blBFUFBPTEFDQ0VTU1BPSU5UQ0EvTGF0ZXN0Q1JMLmNybDAfBgNVHSMEGDAWgBRN9j4AUCiGbTWg
+ /O9mqvoioSTbjTAdBgNVHQ4EFgQU/0So1rHiz4+sceK7P18eVpnBhjgwNwYIKwYBBQUHAQEEKzAp
+ MCcGCCsGAQUFBzABhhtodHRwOi8vcGtpLW9jc3Auc3ltYXV0aC5jb20wEwYDVR0lBAwwCgYIKwYB
+ BQUHAwIwDQYJKoZIhvcNAQELBQADggEBAImyiGHjqEb9Jql2J7ITBmdm6c22E3y5xrR0Ib1UPvYV
+ 7ETQHj/BrCZkSEqJz5akPoEmqHeWDomMYdJLxFQyEqX2gmErggHQZ/PqROZ13TG2f5AuMBmN57H3
+ hXs3TAMpNnk24uGDLSRLkV8JOsZkIYXd+ykKzU4xfxEQe98UWOsgabwt8e6Ak4AJ3T1wpN/YyP+8
+ oQ0lsQ6ZbuWbTf5cPUNO5VwYLEnJKYgDMxJEcx0BfzOXpcTt9EGcm7QRPowIAEXvfXU7mPdwJif6
+ Y8sUbyqRYoG8b1ItBMsTD92ESdKpZzY6AafzSlRkLkD/bBxAqjYuL7RA9poFa5YA4bHSRrM=
+ Aksesspunkt for EEGs meldingssentral
+ leveranse@ergogroup.no
+ www.edbergogroup.no
+
+
+
+
+ https://ap.ergogroup.no/oxalis/accessPointService
+
+
+
+ false
+ 1
+ 2012-03-16T00:00:00Z
+ 2014-02-28T00:00:00Z
+ MIIEMzCCAxugAwIBAgIQU05M5k6dpbee1puonWt5vzANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQG
+ EwJESzEnMCUGA1UEChMeTkFUSU9OQUwgSVQgQU5EIFRFTEVDT00gQUdFTkNZMR8wHQYDVQQDExZQ
+ RVBQT0wgQUNDRVNTIFBPSU5UIENBMB4XDTEzMTAxNzAwMDAwMFoXDTE1MTAxNzIzNTk1OVowODEL
+ MAkGA1UEBhMCTk8xFzAVBgNVBAMMDkFQUF8xMDAwMDAwMDI1MRAwDgYDVQQKDAdFVlJZIEFTMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArHQ6z7INUf2+9NvLV0NvmMg4HDk8fVAh+Hvy
+ wLAXRzSvpefszhz5eQAmd5fxuQfOyevHGBiopU+mVspqSn1CyuD2eYUYG29djgSmIOQlqaj9Ixk4
+ aF0hYmDvyWyyw4PfzDT3j8ur+TYhtEegzUYbWbN2r6ZVcA85kEfssr70JxwVqS7y3IXX+r5r5/vY
+ 3SyUhDQbftG75yeVnj/1AvityfSTTjMlloWRAyDlue+vo+uyKj2zfueUhyWZaxq5EMjgHguDVqIg
+ I74uY5Ho/DIb0A2mEm6urXtk+XxsgMz18zEebD6eH/dFTV7PqraPFAyn866EcT8CWYubvf86XnUo
+ /wIDAQABo4IBGDCCARQwCQYDVR0TBAIwADALBgNVHQ8EBAMCA7gwbAYDVR0fBGUwYzBhoF+gXYZb
+ aHR0cDovL29uc2l0ZWNybC52ZXJpc2lnbi5jb20vRGlnaXRhbGlzZXJpbmdzc3R5cmVsc2VuT3Bl
+ blBFUFBPTEFDQ0VTU1BPSU5UQ0EvTGF0ZXN0Q1JMLmNybDAfBgNVHSMEGDAWgBRN9j4AUCiGbTWg
+ /O9mqvoioSTbjTAdBgNVHQ4EFgQU/0So1rHiz4+sceK7P18eVpnBhjgwNwYIKwYBBQUHAQEEKzAp
+ MCcGCCsGAQUFBzABhhtodHRwOi8vcGtpLW9jc3Auc3ltYXV0aC5jb20wEwYDVR0lBAwwCgYIKwYB
+ BQUHAwIwDQYJKoZIhvcNAQELBQADggEBAImyiGHjqEb9Jql2J7ITBmdm6c22E3y5xrR0Ib1UPvYV
+ 7ETQHj/BrCZkSEqJz5akPoEmqHeWDomMYdJLxFQyEqX2gmErggHQZ/PqROZ13TG2f5AuMBmN57H3
+ hXs3TAMpNnk24uGDLSRLkV8JOsZkIYXd+ykKzU4xfxEQe98UWOsgabwt8e6Ak4AJ3T1wpN/YyP+8
+ oQ0lsQ6ZbuWbTf5cPUNO5VwYLEnJKYgDMxJEcx0BfzOXpcTt9EGcm7QRPowIAEXvfXU7mPdwJif6
+ Y8sUbyqRYoG8b1ItBMsTD92ESdKpZzY6AafzSlRkLkD/bBxAqjYuL7RA9poFa5YA4bHSRrM=
+ Aksesspunkt for EEGs meldingssentral
+ leveranse@ergogroup.no
+ www.edbergogroup.no
+
+
+
+ https://ap.ergogroup.no/oxalis/as2
+
+
+
+ false
+ 1
+ 2012-03-16T00:00:00Z
+ 2014-02-28T00:00:00Z
+ MIIEMzCCAxugAwIBAgIQU05M5k6dpbee1puonWt5vzANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQG
+ EwJESzEnMCUGA1UEChMeTkFUSU9OQUwgSVQgQU5EIFRFTEVDT00gQUdFTkNZMR8wHQYDVQQDExZQ
+ RVBQT0wgQUNDRVNTIFBPSU5UIENBMB4XDTEzMTAxNzAwMDAwMFoXDTE1MTAxNzIzNTk1OVowODEL
+ MAkGA1UEBhMCTk8xFzAVBgNVBAMMDkFQUF8xMDAwMDAwMDI1MRAwDgYDVQQKDAdFVlJZIEFTMIIB
+ IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArHQ6z7INUf2+9NvLV0NvmMg4HDk8fVAh+Hvy
+ wLAXRzSvpefszhz5eQAmd5fxuQfOyevHGBiopU+mVspqSn1CyuD2eYUYG29djgSmIOQlqaj9Ixk4
+ aF0hYmDvyWyyw4PfzDT3j8ur+TYhtEegzUYbWbN2r6ZVcA85kEfssr70JxwVqS7y3IXX+r5r5/vY
+ 3SyUhDQbftG75yeVnj/1AvityfSTTjMlloWRAyDlue+vo+uyKj2zfueUhyWZaxq5EMjgHguDVqIg
+ I74uY5Ho/DIb0A2mEm6urXtk+XxsgMz18zEebD6eH/dFTV7PqraPFAyn866EcT8CWYubvf86XnUo
+ /wIDAQABo4IBGDCCARQwCQYDVR0TBAIwADALBgNVHQ8EBAMCA7gwbAYDVR0fBGUwYzBhoF+gXYZb
+ aHR0cDovL29uc2l0ZWNybC52ZXJpc2lnbi5jb20vRGlnaXRhbGlzZXJpbmdzc3R5cmVsc2VuT3Bl
+ blBFUFBPTEFDQ0VTU1BPSU5UQ0EvTGF0ZXN0Q1JMLmNybDAfBgNVHSMEGDAWgBRN9j4AUCiGbTWg
+ /O9mqvoioSTbjTAdBgNVHQ4EFgQU/0So1rHiz4+sceK7P18eVpnBhjgwNwYIKwYBBQUHAQEEKzAp
+ MCcGCCsGAQUFBzABhhtodHRwOi8vcGtpLW9jc3Auc3ltYXV0aC5jb20wEwYDVR0lBAwwCgYIKwYB
+ BQUHAwIwDQYJKoZIhvcNAQELBQADggEBAImyiGHjqEb9Jql2J7ITBmdm6c22E3y5xrR0Ib1UPvYV
+ 7ETQHj/BrCZkSEqJz5akPoEmqHeWDomMYdJLxFQyEqX2gmErggHQZ/PqROZ13TG2f5AuMBmN57H3
+ hXs3TAMpNnk24uGDLSRLkV8JOsZkIYXd+ykKzU4xfxEQe98UWOsgabwt8e6Ak4AJ3T1wpN/YyP+8
+ oQ0lsQ6ZbuWbTf5cPUNO5VwYLEnJKYgDMxJEcx0BfzOXpcTt9EGcm7QRPowIAEXvfXU7mPdwJif6
+ Y8sUbyqRYoG8b1ItBMsTD92ESdKpZzY6AafzSlRkLkD/bBxAqjYuL7RA9poFa5YA4bHSRrM=
+ Aksesspunkt for EEGs meldingssentral
+ leveranse@ergogroup.no
+ www.edbergogroup.no
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +I/JnSsqMlpm2YZWWZikUz10ZQI=
+
+
+ 0Tl9Fyt/DH2UeIdRocU8/OnDWTruaivmbQnbRkInQ0kBRjrrDO1816OHN6pO5z+lSe3lByb7d0FM
+ 8HF34YVFAJtmzCJ1Bdd9a60C1eTyRaHvkBV0k6M0epPR9hE/6ci0YMtVDTTAq72XJ7xM+3LS77Ca
+ jq8wbODl2LSZb5AiRmAU6YciurCqGbD3Ti1lbn/F/vmlLuRDD3yd//KM2S0fTGAB47Oym+V+0fja
+ gTfbHFFHs+ADvxnu7m7WXK6B9Klh/+WCMwYOIdkzzdSeM60Ge4l1LNMZwpdkTQOtVAq8wxtJgm/g
+ dhdNp+nGmStQ/ztW0UBAXxCo6UnP9e34e3P0ww==
+
+
+ O=Agency for Public Management and eGovernment (DIFI),CN=SMP_2000000005,C=NO
+ MIIEejCCA2KgAwIBAgIQUZcLJS2IyAyxZzsMNqh5UTANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
+ EwJESzEnMCUGA1UEChMeTkFUSU9OQUwgSVQgQU5EIFRFTEVDT00gQUdFTkNZMS0wKwYDVQQDEyRQ
+ RVBQT0wgU0VSVklDRSBNRVRBREFUQSBQVUJMSVNIRVIgQ0EwHhcNMTMwNDE4MDAwMDAwWhcNMTUw
+ NDE4MjM1OTU5WjBkMQswCQYDVQQGEwJOTzEXMBUGA1UEAwwOU01QXzIwMDAwMDAwMDUxPDA6BgNV
+ BAoMM0FnZW5jeSBmb3IgUHVibGljIE1hbmFnZW1lbnQgYW5kIGVHb3Zlcm5tZW50IChESUZJKTCC
+ ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN23HvOaLOcYOi4gTlX1ElVi7joQla/Km9yL
+ k57W8cdfmPu2I6GTo14rO7SSjEEq+m2p0pmNrmCWICstBy3/v9/EvCHW3vDv8xS1UcImwypvRguR
+ 1ATACiR5NeKPUbifjRGUx2rdj3BGnQxb3peDuMDwLifQE/KQxVoyeAyB64th2bUidTuEQRxWPiag
+ 5F556UWZyYXrwja5K0Lj8PVDQ8F099EQBQ5p/6/x/DAZBiukc293Z3UyE2b6JskgVeY2MGhpRYtT
+ 1eelLcGvH+jn6Ehs1c6GcJJFE2vxdwwmyET5J/t2+iJrjsq9pNymZySFtix6JiXhliPm2AkGR501
+ jK0CAwEAAaOCASUwggEhMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgO4MHkGA1UdHwRyMHAwbqBsoGqG
+ aGh0dHA6Ly9vbnNpdGVjcmwudmVyaXNpZ24uY29tL0RpZ2l0YWxpc2VyaW5nc3N0eXJlbHNlbk9w
+ ZW5QRVBQT0xTRVJWSUNFTUVUQURBVEFQVUJMSVNIRVJDQS9MYXRlc3RDUkwuY3JsMB8GA1UdIwQY
+ MBaAFHnLtbQQ65S19XrArC5VoduKN98UMB0GA1UdDgQWBBQ0CizSDL8+dfT85fLEtXr/SeMIBzA3
+ BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly9wa2ktb2NzcC5zeW1hdXRoLmNvbTAT
+ BgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAVNmOc+OhdDhlFEIKjXMvUPeq
+ h8ln15scrn0OhjHW2wreD5+x7zwLjsA7N1KV4+QzSFQS9AskY7ESpyuM0Zpqjr62f+3VgFg+hLWY
+ A++u75lg+Sr34fCUpXBJlM43hbNE9jva5HvmfG0k23Ez+WdjTLSDfIkIYcZUa60ZBrlAbgcnauRW
+ oDYLw77GBrfSkVCGgt+81lVWyZm9vQMX5zf2NZk3x9Crlqdo26L0WWJEd+cgppR9PHuS/8CJpf7M
+ hnOfFDG5NvkPwVIxSFTgAhwDxRgYCCJhXlJmuMtUCmTMmzvCxJ2MDMTdimswVgZiAWr/IIiqHcsv
+ LRzT3bMAGFE1ZQ==
+
+
+
+
diff --git a/oxalis-commons/src/test/resources/sr-smp-result.xml b/oxalis-commons/src/test/resources/sr-smp-result.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e04aaeb461c2b09faef0a08472728955d1b34c35
--- /dev/null
+++ b/oxalis-commons/src/test/resources/sr-smp-result.xml
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+ 9908:810418052
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biitrns010:ver2.0:extended:urn:www.peppol.eu:bis:peppol4a:ver2.0:extended:urn:www.difi.no:ehf:faktura:ver2.0::2.1
+
+
+
+ urn:www.cenbii.eu:profile:bii04:ver2.0
+
+
+
+ https://ap.unit4.com/oxalis/as2
+
+
+
+ false
+ 1
+ 2013-05-06Z
+ 2015-05-06Z
+ MIIENzCCAx+gAwIBAgIQKnxe+4PA67ZgidwVQleWTzANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQG
+ EwJESzEnMCUGA1UEChMeTkFUSU9OQUwgSVQgQU5EIFRFTEVDT00gQUdFTkNZMR8wHQYDVQQDExZQ
+ RVBQT0wgQUNDRVNTIFBPSU5UIENBMB4XDTEzMDUwNjAwMDAwMFoXDTE1MDUwNjIzNTk1OVowPDEL
+ MAkGA1UEBhMCTk8xFzAVBgNVBAMMDkFQUF8xMDAwMDAwMDA2MRQwEgYDVQQKDAtTZW5kUmVnbmlu
+ ZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN5z9spSTvaKXN3M8AYRq6cYQ2LUeyQR
+ 1dWhvQloRIWBreMu/vgAXwA7dKXOFxUZTKV0sPKb1OpG4s+e5N62nv8ztphB4YyR2Tik3SEXh7Zv
+ MHQHD2QYPn/a+LX48AFQWBO4SKqvGaOqtjzcEkDXBO4cs4w1cRKCfZaHGzkHfiTv76BziNDHpwTE
+ QEtaY6ikQUtm8HxSmzD/FQhELeeq8usXAr3S6hVq08mmgICb8/Z+fkp/8Xnis7U6cLxqCWsqb2dh
+ r9Dg6qHEtWs6VD8z6XEq6dttxyB5S5kJVZGG6TM5pcxSakBb3qM8p/yLRrcPGveA660o3LhYB7YS
+ 0yUQfzkCAwEAAaOCARgwggEUMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgO4MGwGA1UdHwRlMGMwYaBf
+ oF2GW2h0dHA6Ly9vbnNpdGVjcmwudmVyaXNpZ24uY29tL0RpZ2l0YWxpc2VyaW5nc3N0eXJlbHNl
+ bk9wZW5QRVBQT0xBQ0NFU1NQT0lOVENBL0xhdGVzdENSTC5jcmwwHwYDVR0jBBgwFoAUTfY+AFAo
+ hm01oPzvZqr6IqEk240wHQYDVR0OBBYEFE5m0gB7Jw7kc+ltliSG0c4pOnq7MDcGCCsGAQUFBwEB
+ BCswKTAnBggrBgEFBQcwAYYbaHR0cDovL3BraS1vY3NwLnN5bWF1dGguY29tMBMGA1UdJQQMMAoG
+ CCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQB0AHTSoKEasnB7lcYSzcMOu+bH5HLSAhCW9Vq0
+ /HcCe9EutwIK2jIHzDS/Gpyfl0MURonA1/OWOdhyClGmgPiQBZKkE0Ir15C6MRhrLHmUMnU9bRIs
+ T8uEoxiXH6biUVw2SrAS69Tt6Xv3ydNhDiFGdxsD+Yfka1ciH6TxOflisqtRuOewSkV0kveQ5LmM
+ X595Br3CImmimNnBjXyqoRbZtNQmOgD85/zmW7BX8JAyCL9b+2aLmUTFQyIiGWiNOk+pdOLtpdhk
+ 9SKEo+hfXQVMWWRPM1S/M+kNJYzjlcC/zL2v2x6JocoBkQSsjhEwcEkIF9UWmiqGKwL3qAKsONni
+
+ SendRegning Access Point Service
+ ap.support@unit4.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ jHX3nq8v2dD8GBVmziI1a0MIJIw=
+
+
+ VjmDRVXWGDKt7o1tTyHiOXyfo7HOyEndmzuiNKYayhlpVxywz3351YA5VuEeg6TUYAFDwBLKBVnn
+ Eo1C1DYbRkLJ4RcWyg0SG8CPU5orjVfLIrPM0o+USJkKSqxO1k+KIQ1p651RqhplFfdAzRwkMxi0
+ LAwgglpiUDqxsUNe7Rqu0CXxuhTVL+plKPaoIfkmlTKaFJBc47GquXuZHjbIhHRt15OHm5175NUr
+ PuLg/SW6OAJfA8iQWJZfUbeEKyc75mxruxlFsqHANTTrkyxe3EaODOmLm98rvFryKqTSQLaE+NQp
+ rLqFRv2NZHoETJ7CpmcT7mKfmoHKpxAs8q8vOA==
+
+
+
+ O=DIFI,CN=SMP_2000000105,C=NO
+ MIIESzCCAzOgAwIBAgIQUu6qu0V/C1UfCp6umaq1VTANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
+ EwJESzEnMCUGA1UEChMeTkFUSU9OQUwgSVQgQU5EIFRFTEVDT00gQUdFTkNZMS0wKwYDVQQDEyRQ
+ RVBQT0wgU0VSVklDRSBNRVRBREFUQSBQVUJMSVNIRVIgQ0EwHhcNMTUwNDEzMDAwMDAwWhcNMTcw
+ NDEyMjM1OTU5WjA1MQswCQYDVQQGEwJOTzEXMBUGA1UEAwwOU01QXzIwMDAwMDAxMDUxDTALBgNV
+ BAoMBERJRkkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCp4ktGxC8ZYoSgjXI0e79N
+ aYMeSNBR0/qCWkucx3AXxL4KPCV+oKHoQEO+7mi1Bj8nKBDql08v1dHWT6yF+IZkKREB8GBPon2P
+ 35r3J0VXPCAgTmQ9IezG7r0JAPueIn6VCHkYKtPAHhDyNZLaNwNRkVcF9jsJQf2M63/1vY8srohV
+ tQ/9mogFpe9DN8DTf47flENqn2gT70dGXm9+XSRh0JfWjb5NqtMVe06/33ON9VAisqzPNS50qcPH
+ PkwMB8uuKBT0pYh6u7XZ1N6xWla6HHCM/ksDZGI8MzMDCVeb14n5SwC/dQayjFf+Xv+hEzY0aKIt
+ 3DS4eE2bD78isSmfAgMBAAGjggElMIIBITAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDuDB5BgNVHR8E
+ cjBwMG6gbKBqhmhodHRwOi8vb25zaXRlY3JsLnZlcmlzaWduLmNvbS9EaWdpdGFsaXNlcmluZ3Nz
+ dHlyZWxzZW5PcGVuUEVQUE9MU0VSVklDRU1FVEFEQVRBUFVCTElTSEVSQ0EvTGF0ZXN0Q1JMLmNy
+ bDAfBgNVHSMEGDAWgBR5y7W0EOuUtfV6wKwuVaHbijffFDAdBgNVHQ4EFgQUOhoCtatRUFglqARw
+ aBqhJW3GDCcwNwYIKwYBBQUHAQEEKzApMCcGCCsGAQUFBzABhhtodHRwOi8vcGtpLW9jc3Auc3lt
+ YXV0aC5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAKMNFsNLVJeq
+ 3jDv1QxdzMqHkpIUKC91Y4DHUAD9VVLjo5gk1XGd4BzasxvzGiwQmtcgBr0Uy5T54VdcfJIGcQ5D
+ QPszNz5kT6it0sSawIGsJUm1h4+NCOoF15mT5/i1DpGiYuPoJBpB2XI2YknOgCHtneW4zxskzk0F
+ 7FgShSvrfl6VScipCHarNpB7aBGuPRMNBOLotym2J+Fb9zG/XJo2pcWkox5ZHZqt9uMht4qFCZG5
+ RcUG2rf3q97WSvDFHtq31DYAxx9yNjiGNTo3KywNiLhMIZBDEND6tJ5XCQGPMI49V8Pc8Ikea+4q
+ kQpEYQQJsEAVfh2nQAnWJtKxaS0=
+
+
+
+
+
\ No newline at end of file
diff --git a/oxalis-commons/src/test/resources/sr-utf8.xml b/oxalis-commons/src/test/resources/sr-utf8.xml
new file mode 100644
index 0000000000000000000000000000000000000000..97f26d85e7aa50f81ba469458c8e3c185efac374
--- /dev/null
+++ b/oxalis-commons/src/test/resources/sr-utf8.xml
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+ 9908:810418052
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biitrns010:ver2.0:extended:urn:www.peppol.eu:bis:peppol4a:ver2.0:extended:urn:www.difi.no:ehf:faktura:ver2.0::2.1
+
+
+
+ urn:www.cenbii.eu:profile:bii04:ver2.0
+
+
+
+ https://ap.unit4.com/oxalis/as2
+
+
+
+ false
+ 1
+ 2013-05-06Z
+ 2015-05-06Z
+ MIIENzCCAx+gAwIBAgIQKnxe+4PA67ZgidwVQleWTzANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQG
+ EwJESzEnMCUGA1UEChMeTkFUSU9OQUwgSVQgQU5EIFRFTEVDT00gQUdFTkNZMR8wHQYDVQQDExZQ
+ RVBQT0wgQUNDRVNTIFBPSU5UIENBMB4XDTEzMDUwNjAwMDAwMFoXDTE1MDUwNjIzNTk1OVowPDEL
+ MAkGA1UEBhMCTk8xFzAVBgNVBAMMDkFQUF8xMDAwMDAwMDA2MRQwEgYDVQQKDAtTZW5kUmVnbmlu
+ ZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN5z9spSTvaKXN3M8AYRq6cYQ2LUeyQR
+ 1dWhvQloRIWBreMu/vgAXwA7dKXOFxUZTKV0sPKb1OpG4s+e5N62nv8ztphB4YyR2Tik3SEXh7Zv
+ MHQHD2QYPn/a+LX48AFQWBO4SKqvGaOqtjzcEkDXBO4cs4w1cRKCfZaHGzkHfiTv76BziNDHpwTE
+ QEtaY6ikQUtm8HxSmzD/FQhELeeq8usXAr3S6hVq08mmgICb8/Z+fkp/8Xnis7U6cLxqCWsqb2dh
+ r9Dg6qHEtWs6VD8z6XEq6dttxyB5S5kJVZGG6TM5pcxSakBb3qM8p/yLRrcPGveA660o3LhYB7YS
+ 0yUQfzkCAwEAAaOCARgwggEUMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgO4MGwGA1UdHwRlMGMwYaBf
+ oF2GW2h0dHA6Ly9vbnNpdGVjcmwudmVyaXNpZ24uY29tL0RpZ2l0YWxpc2VyaW5nc3N0eXJlbHNl
+ bk9wZW5QRVBQT0xBQ0NFU1NQT0lOVENBL0xhdGVzdENSTC5jcmwwHwYDVR0jBBgwFoAUTfY+AFAo
+ hm01oPzvZqr6IqEk240wHQYDVR0OBBYEFE5m0gB7Jw7kc+ltliSG0c4pOnq7MDcGCCsGAQUFBwEB
+ BCswKTAnBggrBgEFBQcwAYYbaHR0cDovL3BraS1vY3NwLnN5bWF1dGguY29tMBMGA1UdJQQMMAoG
+ CCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQB0AHTSoKEasnB7lcYSzcMOu+bH5HLSAhCW9Vq0
+ /HcCe9EutwIK2jIHzDS/Gpyfl0MURonA1/OWOdhyClGmgPiQBZKkE0Ir15C6MRhrLHmUMnU9bRIs
+ T8uEoxiXH6biUVw2SrAS69Tt6Xv3ydNhDiFGdxsD+Yfka1ciH6TxOflisqtRuOewSkV0kveQ5LmM
+ X595Br3CImmimNnBjXyqoRbZtNQmOgD85/zmW7BX8JAyCL9b+2aLmUTFQyIiGWiNOk+pdOLtpdhk
+ 9SKEo+hfXQVMWWRPM1S/M+kNJYzjlcC/zL2v2x6JocoBkQSsjhEwcEkIF9UWmiqGKwL3qAKsONni
+
+ SendRegning Access Point Service ÆØÅ
+ ap.support@unit4.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ T0XeBTl44QVUM+GSKcm3n8TyA1Q=
+
+
+ YSPxSS4tq1O/gqABCFDdfSpvEbD86OIZcaSbiEfDyLrRVZGC44A2ffo5VwYtuH8P+zYyhM5Cwbbo
+ XT2KjZ7aAXTZGDXarGelrwoVHnQBGQ/EyDKGZbdtOaEDSWyAJsJwcQanCy2izm53S5TZMZRM9glx
+ ODUPoWY16xaUlZ7ji2+mPVUrRIEbbwtSnUz8zXMf/szce3vfaExmT2Buysiqqx7rednL6IM7G69k
+ j9AljhZnFfAFMQFJGXAOjE+SMQPJ/4rtVlJr8I/2uUX6ZAaqaDseEvt2Gt1JyurrfoPYCsFw4YWn
+ pOes8ME0qR5zFMJJL4gyIpmBl9tkegH6rulqQw==
+
+
+
+ O=DIFI,CN=SMP_2000000105,C=NO
+ MIIESzCCAzOgAwIBAgIQUu6qu0V/C1UfCp6umaq1VTANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
+ EwJESzEnMCUGA1UEChMeTkFUSU9OQUwgSVQgQU5EIFRFTEVDT00gQUdFTkNZMS0wKwYDVQQDEyRQ
+ RVBQT0wgU0VSVklDRSBNRVRBREFUQSBQVUJMSVNIRVIgQ0EwHhcNMTUwNDEzMDAwMDAwWhcNMTcw
+ NDEyMjM1OTU5WjA1MQswCQYDVQQGEwJOTzEXMBUGA1UEAwwOU01QXzIwMDAwMDAxMDUxDTALBgNV
+ BAoMBERJRkkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCp4ktGxC8ZYoSgjXI0e79N
+ aYMeSNBR0/qCWkucx3AXxL4KPCV+oKHoQEO+7mi1Bj8nKBDql08v1dHWT6yF+IZkKREB8GBPon2P
+ 35r3J0VXPCAgTmQ9IezG7r0JAPueIn6VCHkYKtPAHhDyNZLaNwNRkVcF9jsJQf2M63/1vY8srohV
+ tQ/9mogFpe9DN8DTf47flENqn2gT70dGXm9+XSRh0JfWjb5NqtMVe06/33ON9VAisqzPNS50qcPH
+ PkwMB8uuKBT0pYh6u7XZ1N6xWla6HHCM/ksDZGI8MzMDCVeb14n5SwC/dQayjFf+Xv+hEzY0aKIt
+ 3DS4eE2bD78isSmfAgMBAAGjggElMIIBITAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDuDB5BgNVHR8E
+ cjBwMG6gbKBqhmhodHRwOi8vb25zaXRlY3JsLnZlcmlzaWduLmNvbS9EaWdpdGFsaXNlcmluZ3Nz
+ dHlyZWxzZW5PcGVuUEVQUE9MU0VSVklDRU1FVEFEQVRBUFVCTElTSEVSQ0EvTGF0ZXN0Q1JMLmNy
+ bDAfBgNVHSMEGDAWgBR5y7W0EOuUtfV6wKwuVaHbijffFDAdBgNVHQ4EFgQUOhoCtatRUFglqARw
+ aBqhJW3GDCcwNwYIKwYBBQUHAQEEKzApMCcGCCsGAQUFBzABhhtodHRwOi8vcGtpLW9jc3Auc3lt
+ YXV0aC5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAKMNFsNLVJeq
+ 3jDv1QxdzMqHkpIUKC91Y4DHUAD9VVLjo5gk1XGd4BzasxvzGiwQmtcgBr0Uy5T54VdcfJIGcQ5D
+ QPszNz5kT6it0sSawIGsJUm1h4+NCOoF15mT5/i1DpGiYuPoJBpB2XI2YknOgCHtneW4zxskzk0F
+ 7FgShSvrfl6VScipCHarNpB7aBGuPRMNBOLotym2J+Fb9zG/XJo2pcWkox5ZHZqt9uMht4qFCZG5
+ RcUG2rf3q97WSvDFHtq31DYAxx9yNjiGNTo3KywNiLhMIZBDEND6tJ5XCQGPMI49V8Pc8Ikea+4q
+ kQpEYQQJsEAVfh2nQAnWJtKxaS0=
+
+
+
+
+
\ No newline at end of file
diff --git a/oxalis-commons/src/test/resources/statistics-response-multiple-entries.xml b/oxalis-commons/src/test/resources/statistics-response-multiple-entries.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0791b88f0ff2b8ca2ac39c5126e4a20c199cab01
--- /dev/null
+++ b/oxalis-commons/src/test/resources/statistics-response-multiple-entries.xml
@@ -0,0 +1,205 @@
+
+
+
+
+
+ AP001
+ OUT
+ 2013-02-24T07
+ 9908:810418052
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ CH01
+ 1
+
+
+ SendRegning
+ IN
+ 2013-02-24T12
+ 9908:810418052
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ CH1
+ 1
+
+
+ SendRegning
+ OUT
+ 2013-02-24T12
+ 9908:810418052
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ CH1
+ 1
+
+
+ SendRegning
+ OUT
+ 2013-03-08T02
+ 9908:810418052
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ TEST
+ 1
+
+
+ AP001
+ OUT
+ 2013-03-11T01
+ 9908:810418052
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ CH01
+ 1
+
+
+ SendRegning
+ OUT
+ 2013-03-19T06
+ 9908:810418052
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ CH1
+ 5
+
+
+ SendRegning
+ OUT
+ 2013-03-19T07
+ 9908:810418052
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ CH1
+ 6
+
+
+ SendRegning
+ OUT
+ 2013-03-19T08
+ 9908:810418052
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ CH1
+ 5
+
+
+ SendRegning
+ OUT
+ 2013-03-19T09
+ 9908:810418052
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ CH1
+ 1
+
+
+ AP001
+ OUT
+ 2013-03-20T11
+ 9908:810418052
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ CH01
+ 1
+
+
+ SendRegning
+ OUT
+ 2013-03-20T11
+ 9908:810418052
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ CH1
+ 1
+
+
+ AP001
+ OUT
+ 2013-03-22T05
+ 9908:810418052
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ CH01
+ 1
+
+
+ AP001
+ OUT
+ 2013-03-25T03
+ 9908:810418052
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ CH01
+ 2
+
+
+ AP001
+ OUT
+ 2013-03-25T04
+ 9908:810418052
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ CH01
+ 1
+
+
+ AP001
+ OUT
+ 2013-03-26T11
+ 9908:810418052
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ CH01
+ 1
+
+
diff --git a/oxalis-commons/src/test/resources/unit4-accesspoint.cer b/oxalis-commons/src/test/resources/unit4-accesspoint.cer
new file mode 100644
index 0000000000000000000000000000000000000000..64b82687f9943a4146945f7339cee2e426111d23
--- /dev/null
+++ b/oxalis-commons/src/test/resources/unit4-accesspoint.cer
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIENDCCAxygAwIBAgIQA5SFQ9IMsNUJholTX9QEUzANBgkqhkiG9w0BAQsFADBX
+MQswCQYDVQQGEwJESzEnMCUGA1UEChMeTkFUSU9OQUwgSVQgQU5EIFRFTEVDT00g
+QUdFTkNZMR8wHQYDVQQDExZQRVBQT0wgQUNDRVNTIFBPSU5UIENBMB4XDTE3MDMy
+OTAwMDAwMFoXDTE5MDMyOTIzNTk1OVowOTELMAkGA1UEBhMCTk8xFzAVBgNVBAMM
+DkFQUF8xMDAwMDAwMzEyMREwDwYDVQQKDAhVbml0NCBBUzCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALx3ZcnnhdMKsWPeTkL8elP66maXShuq2El7KcM8
+wbhvhLCGfaEft/aQZ17SBGOQrhZXVyEhubEWaddVPVatsPmPgiAeU/JOctsf1sy2
+JbI217C3DijG1/+hmu7Wor6VIurbEvQKfe699HPznTcA5Vgg5UbVLroK6Vp8CAJy
+v0M2YYUMOaJDyyQxrU2YTyyfk4h0OhJ8iUPKd69STJTYlLcoH+5xT05hABI0Tozu
+kFB/3ajGsYILyF7p0ur5XM3t9k7Jhwf/h6a0SrFXDDqIP5rp7pSNuaQYF4nbaTZD
+/Vw1wdrwcMYNS5G4WYM2UK1F1WTOtV6F1WuiI8mpzMon54ECAwEAAaOCARgwggEU
+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgO4MGwGA1UdHwRlMGMwYaBfoF2GW2h0dHA6
+Ly9vbnNpdGVjcmwudmVyaXNpZ24uY29tL0RpZ2l0YWxpc2VyaW5nc3N0eXJlbHNl
+bk9wZW5QRVBQT0xBQ0NFU1NQT0lOVENBL0xhdGVzdENSTC5jcmwwHwYDVR0jBBgw
+FoAUTfY+AFAohm01oPzvZqr6IqEk240wHQYDVR0OBBYEFFYe3zPaoLZHLAx3vYoV
+0tOB4eClMDcGCCsGAQUFBwEBBCswKTAnBggrBgEFBQcwAYYbaHR0cDovL3BraS1v
+Y3NwLnN5bWF1dGguY29tMBMGA1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEB
+CwUAA4IBAQA9KKlOju3BkHEOqev155f/RcaA56PnSG+T1tp8KQyAQDr1DT/+5CsK
+50Qbw4lfP3aERUH0FmnBKLLWi6EFLAxXRmaRZj84KoPAXmgtI5OHHsiTMHhY5vgP
+8eRKs9x5Alo424ZQN8vbPJs1H1AfJIUPD9VoCJQp4ELMpN7Rd7bU+HkNOET9uZfl
+APH4OuFlb95APIaVRuE8syt1ngNt8TmjKTGfUpDfkRiyoLrQY213fVlJXqUKXeGj
+3Uk840qta3NHuwDUgv2loSsnlHg7+RvAghBM2zgztTJjMxaG7NSC9gMf4q1jMJUJ
+3mGoHZweGWWaI7ue4AuCe5TusOWpwO7/
+-----END CERTIFICATE-----
diff --git a/oxalis-commons/src/test/resources/xledger-2013-04-19T16_02_54_281.xml b/oxalis-commons/src/test/resources/xledger-2013-04-19T16_02_54_281.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8287ba6596ff252f9fe37aaa7986c5e9d75a6515
--- /dev/null
+++ b/oxalis-commons/src/test/resources/xledger-2013-04-19T16_02_54_281.xml
@@ -0,0 +1,144 @@
+
+
+
+
+
+ xledger
+ OUT
+ 2013-04-17T02
+ 9908:880526642
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0#urn:www.difi.no:ehf:faktura:ver1::2.0
+ urn:www.cenbii.eu:profile:bii05:ver1.0
+
+ 1
+
+
+ xledger
+ OUT
+ 2013-04-17T02
+ 9908:898307492
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0#urn:www.difi.no:ehf:faktura:ver1::2.0
+ urn:www.cenbii.eu:profile:bii05:ver1.0
+
+ 1
+
+
+ xledger
+ OUT
+ 2013-04-17T02
+ 9908:993884871
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0#urn:www.difi.no:ehf:faktura:ver1::2.0
+ urn:www.cenbii.eu:profile:bii05:ver1.0
+
+ 2
+
+
+ xledger
+ OUT
+ 2013-04-17T03
+ 9908:877380092
+ urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2::CreditNote##urn:www.cenbii.eu:transaction:biicoretrdm014:ver1.0:#urn:www.cenbii.eu:profile:biixx:ver1.0#urn:www.difi.no:ehf:kreditnota:ver1::2.0
+ urn:www.cenbii.eu:profile:bii05:ver1.0
+
+ 1
+
+
+ xledger
+ OUT
+ 2013-04-18T05
+ 9908:983669409
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0#urn:www.difi.no:ehf:faktura:ver1::2.0
+ urn:www.cenbii.eu:profile:bii05:ver1.0
+
+ 1
+
+
+ xledger
+ OUT
+ 2013-04-18T12
+ 9908:980562484
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0#urn:www.difi.no:ehf:faktura:ver1::2.0
+ urn:www.cenbii.eu:profile:bii05:ver1.0
+
+ 2
+
+
+ xledger
+ IN
+ 2013-04-19T02
+ 9908:987290986
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0#urn:www.difi.no:ehf:faktura:ver1::2.0
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+
+ 1
+
+
+ xledger
+ IN
+ 2013-04-19T03
+ 9908:848072222
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0#urn:www.difi.no:ehf:faktura:ver1::2.0
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+
+ 1
+
+
+ xledger
+ IN
+ 2013-04-19T08
+ 9908:980374068
+ urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2::CreditNote##urn:www.cenbii.eu:transaction:biicoretrdm014:ver1.0:#urn:www.cenbii.eu:profile:biixx:ver1.0#urn:www.difi.no:ehf:kreditnota:ver1::2.0
+ urn:www.cenbii.eu:profile:bii05:ver1.0
+
+ 1
+
+
+ xledger
+ IN
+ 2013-04-19T09
+ 9908:895189642
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0#urn:www.difi.no:ehf:faktura:ver1::2.0
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+
+ 1
+
+
+ xledger
+ OUT
+ 2013-04-19T10
+ 9908:898307492
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0#urn:www.difi.no:ehf:faktura:ver1::2.0
+ urn:www.cenbii.eu:profile:bii05:ver1.0
+
+ 1
+
+
+ xledger
+ OUT
+ 2013-04-19T11
+ 9908:993884871
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0#urn:www.difi.no:ehf:faktura:ver1::2.0
+ urn:www.cenbii.eu:profile:bii05:ver1.0
+
+ 1
+
\ No newline at end of file
diff --git a/oxalis-dist/README.md b/oxalis-dist/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..7fe5817e11af4079d8d66aa921b4b23d49484590
--- /dev/null
+++ b/oxalis-dist/README.md
@@ -0,0 +1,20 @@
+# Oxalis Distributions
+
+Oxalis is provided in different distributions to allow users to easily adopt Oxalis into their environment.
+
+The following distributions are available:
+
+* **[Oxalis Distribution](/oxalis-dist/oxalis-distribution)** -
+ The traditional distribution package of Oxalis.
+
+* **[Oxalis Server](/oxalis-dist/oxalis-server)** -
+ Oxalis as an application needing only Java 8 to run.
+ This is the distribution used to create the Docker image.
+
+* **[Oxalis Standalone](/oxalis-dist/oxalis-standalone)** -
+ Simple client for sending provided as a single java archive (jar).
+ Suited for testing and small manual tasks.
+
+* **[Oxalis WAR](/oxalis-dist/oxalis-war)** -
+ The traditional war distribution for application servers recreated to use Java Servlet 3.0 functionality.
+ This is the distribution made available as `oxalis.war` in `oxalis-distribution`.
\ No newline at end of file
diff --git a/oxalis-dist/oxalis-distribution/pom.xml b/oxalis-dist/oxalis-distribution/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fb4c82e2c68cd2407616c17ca829287a5a97a446
--- /dev/null
+++ b/oxalis-dist/oxalis-distribution/pom.xml
@@ -0,0 +1,112 @@
+
+
+
+
+
+ 4.0.0
+
+
+ oxalis
+ dk.erst.oxalis
+ 0.9.0-e2f4121ccb55b5a60e6edebf7b28d277741d6789
+ ../../pom.xml
+
+
+ oxalis-distribution
+ pom
+
+ Oxalis :: Dist :: Distribution
+ Creates a complete distribution which may be uploaded and made available.
+ https://rep.erst.dk/git/openebusiness/nemhandeledelivery/oxalis
+
+
+ Erhvervsstyrelsen
+ https://nemhandel.dk/
+
+
+
+
+ dk.erst.oxalis
+ oxalis-standalone
+
+
+ dk.erst.oxalis
+ oxalis-statistics
+
+
+
+
+
+ dist
+
+
+
+ maven-assembly-plugin
+
+
+ target
+
+ src/main/assembly/distribution.xml
+
+
+
+
+ make-distribution
+
+ package
+
+
+ single
+
+
+
+
+
+ maven-resources-plugin
+
+
+ copy-resources
+ package
+
+ copy-resources
+
+
+ ../../target/distribution
+
+
+ ${project.build.directory}/${project.build.finalName}-distro
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oxalis-dist/oxalis-distribution/src/main/assembly/distribution.xml b/oxalis-dist/oxalis-distribution/src/main/assembly/distribution.xml
new file mode 100644
index 0000000000000000000000000000000000000000..65a48c9633f9e0d7a5cc748a58a90fcad0e6bc48
--- /dev/null
+++ b/oxalis-dist/oxalis-distribution/src/main/assembly/distribution.xml
@@ -0,0 +1,115 @@
+
+
+
+
+ distro
+ false
+
+
+
+ dir
+ tar.gz
+ zip
+
+
+
+
+
+ ../oxalis-distribution/src/main/resources
+ etc
+
+ *.xml
+ *.properties
+
+ windows
+
+
+
+
+ ../../doc
+ doc
+
+ */**
+
+
+
+
+
+ ../oxalis-standalone/src/main/bash
+ bin
+
+ *.sh
+
+
+
+
+
+ ../../oxalis-legacy/oxalis-statistics/src/main/resources/sql
+ sql
+
+ *.sql
+
+
+
+
+ ../oxalis-standalone/target
+ bin
+
+ oxalis-standalone.jar
+
+
+
+
+
+
+
+ true
+
+ network.oxalis:oxalis-war:*
+
+
+ false
+ false
+ jee
+
+ oxalis.${artifact.extension}
+
+
+
+
+ true
+
+ network.oxalis:oxalis-outbound:*
+
+
+ true
+ false
+ api
+
+
+
+
+
+
\ No newline at end of file
diff --git a/oxalis-dist/oxalis-distribution/src/main/resources/logback-oxalis-app.xml b/oxalis-dist/oxalis-distribution/src/main/resources/logback-oxalis-app.xml
new file mode 100644
index 0000000000000000000000000000000000000000..53ad57a1a64d78bfee2114e3973efa89873c7f44
--- /dev/null
+++ b/oxalis-dist/oxalis-distribution/src/main/resources/logback-oxalis-app.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+ oxalis-logs-app/oxalis-app.log
+
+ %d %p [%c] [%X{senderId}] %m %n
+
+
+ oxalis-logs-app/oxalis-app.%d{yyyy-MM-dd}.log
+
+
+
+
+ 280
+
+
+
+
+
+
+
diff --git a/oxalis-dist/oxalis-distribution/src/main/resources/logback-oxalis-server.xml b/oxalis-dist/oxalis-distribution/src/main/resources/logback-oxalis-server.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3e7594bf45be6fde80b23a415b89d813a89112fe
--- /dev/null
+++ b/oxalis-dist/oxalis-distribution/src/main/resources/logback-oxalis-server.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+ ../logs/oxalis.log
+
+ %d %p [%c] [%X{senderId}] %m %n
+
+
+ ../logs/oxalis.%d{yyyy-MM-dd}.log
+
+
+
+
+ 280
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oxalis-dist/oxalis-server/pom.xml b/oxalis-dist/oxalis-server/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c2dbf49e6a2919b0b7b8247ea23c3cb06be070b8
--- /dev/null
+++ b/oxalis-dist/oxalis-server/pom.xml
@@ -0,0 +1,125 @@
+
+
+
+
+
+ oxalis
+ dk.erst.oxalis
+ 0.9.0-e2f4121ccb55b5a60e6edebf7b28d277741d6789
+ ../../pom.xml
+
+ 4.0.0
+
+ oxalis-server
+
+ Oxalis :: Dist :: Server
+ Oxalis Server with standard Oxalis features only.
+ https://rep.erst.dk/git/openebusiness/nemhandeledelivery/oxalis
+
+
+ Erhvervsstyrelsen
+ https://nemhandel.dk/
+
+
+
+
+
+ dk.erst.oxalis
+ oxalis-inbound
+
+
+ dk.erst.oxalis
+ oxalis-outbound
+
+
+
+
+ dk.erst.oxalis
+ oxalis-extension-testbed
+
+
+
+
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-servlet
+
+
+
+
+
+
+ dist
+
+
+
+ maven-assembly-plugin
+
+
+ src/main/assembly/assembly-full.xml
+
+
+
+
+ create-distribution-package
+ package
+
+ single
+
+
+
+
+
+ maven-resources-plugin
+
+
+ copy-resources
+ package
+
+ copy-resources
+
+
+ ../../target
+
+
+ ${project.build.directory}/${project.build.finalName}-full
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oxalis-dist/oxalis-server/src/main/assembly/assembly-full.xml b/oxalis-dist/oxalis-server/src/main/assembly/assembly-full.xml
new file mode 100644
index 0000000000000000000000000000000000000000..827b54409ed97cbf26667a8430a8b64456da20d0
--- /dev/null
+++ b/oxalis-dist/oxalis-server/src/main/assembly/assembly-full.xml
@@ -0,0 +1,46 @@
+
+
+
+ full
+
+ dir
+ tar.gz
+ zip
+
+ false
+
+
+ src/main/assembly/full
+ /oxalis-server
+
+ */**/.gitignore
+ */**/.gitkeep
+
+
+
+
+
+ oxalis-server/lib
+
+
+
\ No newline at end of file
diff --git a/oxalis-dist/oxalis-server/src/main/assembly/full/bin/run.bat b/oxalis-dist/oxalis-server/src/main/assembly/full/bin/run.bat
new file mode 100644
index 0000000000000000000000000000000000000000..65c96099b565a1e10f3fa24614de63417ce28ab4
--- /dev/null
+++ b/oxalis-dist/oxalis-server/src/main/assembly/full/bin/run.bat
@@ -0,0 +1,4 @@
+@echo off
+cd %0\..\..
+
+java %JAVA_OPTS% -classpath conf/*;lib/*;ext/* network.oxalis.server.Main %*
\ No newline at end of file
diff --git a/oxalis-dist/oxalis-server/src/main/assembly/full/bin/run.sh b/oxalis-dist/oxalis-server/src/main/assembly/full/bin/run.sh
new file mode 100644
index 0000000000000000000000000000000000000000..67e777c06be2475288f82833d1d3bc626895c62a
--- /dev/null
+++ b/oxalis-dist/oxalis-server/src/main/assembly/full/bin/run.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cd $(dirname $(readlink -f $0))/..
+
+exec java $JAVA_OPTS -classpath conf/*:lib/*:ext/* network.oxalis.server.Main $@
\ No newline at end of file
diff --git a/oxalis-dist/oxalis-server/src/main/assembly/full/conf/.gitignore b/oxalis-dist/oxalis-server/src/main/assembly/full/conf/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..5aaee21f93eacdb7248433ada9f31fececd1b051
--- /dev/null
+++ b/oxalis-dist/oxalis-server/src/main/assembly/full/conf/.gitignore
@@ -0,0 +1 @@
+oxalis-keystore.jks
\ No newline at end of file
diff --git a/oxalis-dist/oxalis-server/src/main/assembly/full/conf/.gitkeep b/oxalis-dist/oxalis-server/src/main/assembly/full/conf/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/oxalis-dist/oxalis-server/src/main/assembly/full/ext/.gitkeep b/oxalis-dist/oxalis-server/src/main/assembly/full/ext/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/oxalis-dist/oxalis-server/src/main/assembly/full/inbound/.gitkeep b/oxalis-dist/oxalis-server/src/main/assembly/full/inbound/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/oxalis-dist/oxalis-server/src/main/assembly/full/plugin/.gitkeep b/oxalis-dist/oxalis-server/src/main/assembly/full/plugin/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/oxalis-dist/oxalis-server/src/main/java/network/oxalis/server/Main.java b/oxalis-dist/oxalis-server/src/main/java/network/oxalis/server/Main.java
new file mode 100644
index 0000000000000000000000000000000000000000..fe4c21c172208180a2c477f61738bf0543cab36c
--- /dev/null
+++ b/oxalis-dist/oxalis-server/src/main/java/network/oxalis/server/Main.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.server;
+
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.Singleton;
+import com.google.inject.servlet.GuiceFilter;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.api.settings.Settings;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import network.oxalis.inbound.OxalisGuiceContextListener;
+import network.oxalis.server.jetty.JettyConf;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.HandlerList;
+import org.eclipse.jetty.server.handler.ShutdownHandler;
+import org.eclipse.jetty.server.handler.StatisticsHandler;
+import org.eclipse.jetty.servlet.DefaultServlet;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+
+import javax.servlet.DispatcherType;
+import java.util.EnumSet;
+
+/**
+ * @author erlend
+ */
+@Slf4j
+@Singleton
+public class Main {
+
+ @Inject
+ private Injector injector;
+
+ @Inject
+ private Settings settings;
+
+ public static void main(String... args) throws Exception {
+ GuiceModuleLoader.initiate().getInstance(Main.class).run();
+ }
+
+ public void run() throws Exception {
+ Server server = new Server(settings.getInt(JettyConf.PORT));
+
+ HandlerList handlers = new HandlerList();
+
+ if (settings.getString(JettyConf.SHUTDOWN_TOKEN) != null)
+ handlers.addHandler(new ShutdownHandler(settings.getString(JettyConf.SHUTDOWN_TOKEN), false, true));
+
+ ServletContextHandler handler = new ServletContextHandler(server, settings.getString(JettyConf.CONTEXT_PATH));
+ handler.addFilter(GuiceFilter.class, "/*", EnumSet.allOf(DispatcherType.class));
+ handler.addEventListener(new OxalisGuiceContextListener(injector));
+ handler.addServlet(DefaultServlet.class, "/");
+ handlers.addHandler(handler);
+
+ StatisticsHandler statisticsHandler = new StatisticsHandler();
+ statisticsHandler.setHandler(handler);
+ handlers.addHandler(statisticsHandler);
+
+ server.setHandler(handlers);
+ server.setStopTimeout(settings.getInt(JettyConf.STOP_TIMEOUT));
+ server.setStopAtShutdown(true);
+
+ log.info("Starting server");
+ server.start();
+ server.join();
+ }
+}
diff --git a/oxalis-dist/oxalis-server/src/main/java/network/oxalis/server/jetty/JettyConf.java b/oxalis-dist/oxalis-server/src/main/java/network/oxalis/server/jetty/JettyConf.java
new file mode 100644
index 0000000000000000000000000000000000000000..89bc54ea7bbdfaf2924b2675575b576ffc028f3f
--- /dev/null
+++ b/oxalis-dist/oxalis-server/src/main/java/network/oxalis/server/jetty/JettyConf.java
@@ -0,0 +1,30 @@
+package network.oxalis.server.jetty;
+
+import network.oxalis.api.settings.DefaultValue;
+import network.oxalis.api.settings.Nullable;
+import network.oxalis.api.settings.Path;
+import network.oxalis.api.settings.Title;
+
+/**
+ * @author erlend
+ */
+@Title("Jetty")
+public enum JettyConf {
+
+ @Path("oxalis.jetty.port")
+ @DefaultValue("8080")
+ PORT,
+
+ @Path("oxalis.jetty.context_path")
+ @DefaultValue("/")
+ CONTEXT_PATH,
+
+ @Path("oxalis.jetty.shutdown_token")
+ @Nullable
+ SHUTDOWN_TOKEN,
+
+ @Path("oxalis.jetty.stop_timeout")
+ @DefaultValue("10000")
+ STOP_TIMEOUT,
+
+}
diff --git a/oxalis-dist/oxalis-server/src/main/java/network/oxalis/server/jetty/JettyModule.java b/oxalis-dist/oxalis-server/src/main/java/network/oxalis/server/jetty/JettyModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..dc7937a6fd4a133e48434a285bb688682ed678cf
--- /dev/null
+++ b/oxalis-dist/oxalis-server/src/main/java/network/oxalis/server/jetty/JettyModule.java
@@ -0,0 +1,14 @@
+package network.oxalis.server.jetty;
+
+import network.oxalis.commons.guice.OxalisModule;
+
+/**
+ * @author erlend
+ */
+public class JettyModule extends OxalisModule {
+
+ @Override
+ protected void configure() {
+ bindSettings(JettyConf.class);
+ }
+}
diff --git a/oxalis-dist/oxalis-server/src/main/resources/logback.xml b/oxalis-dist/oxalis-server/src/main/resources/logback.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d26c1f189f52b5a41b5d733b577a03895cf95e07
--- /dev/null
+++ b/oxalis-dist/oxalis-server/src/main/resources/logback.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+ %d %X{message-id} %p [%c] %m %n
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oxalis-dist/oxalis-server/src/main/resources/reference.conf b/oxalis-dist/oxalis-server/src/main/resources/reference.conf
new file mode 100644
index 0000000000000000000000000000000000000000..5bc84146a1d55924998fc3f06e895ba6ea39c1f8
--- /dev/null
+++ b/oxalis-dist/oxalis-server/src/main/resources/reference.conf
@@ -0,0 +1,4 @@
+oxalis.module.server.jetty.class = network.oxalis.server.jetty.JettyModule
+
+oxalis.path.conf = conf
+oxalis.path.plugin = plugin
\ No newline at end of file
diff --git a/oxalis-dist/oxalis-standalone/.gitignore b/oxalis-dist/oxalis-standalone/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..82b1791bd281654b39f4b2e21bf0fb7c1e4b981d
--- /dev/null
+++ b/oxalis-dist/oxalis-standalone/.gitignore
@@ -0,0 +1,2 @@
+/*-mdn.txt
+/*-rem-evidence.xml
\ No newline at end of file
diff --git a/oxalis-dist/oxalis-standalone/example.bat b/oxalis-dist/oxalis-standalone/example.bat
new file mode 100644
index 0000000000000000000000000000000000000000..6502ac20f4fe7f6466db45dfbd74e969af10dd13
--- /dev/null
+++ b/oxalis-dist/oxalis-standalone/example.bat
@@ -0,0 +1,21 @@
+@echo off
+REM
+REM Sends a sample invoice to Difi's test server.
+REM Check the results at
+REM https://test-aksesspunkt.difi.no/inbound/9908_810418052/
+REM
+@echo on
+java -jar target/oxalis-standalone.jar -f src/test/resources/BII04_T10_PEPPOL-v2.0_invoice.xml^
+ -r 9908:810418052 ^
+ -s 9909:810418052
+@echo off
+
+REM Sends a sample invoice to your own local access point
+@echo on
+java -jar target/oxalis-standalone.jar -f src/test/resources/BII04_T10_PEPPOL-v2.0_invoice.xml^
+ -r 9908:810418052^
+ -s 9946:ESPAP^
+ -u http://localhost:8080/oxalis/as2^
+ -m as2^
+ -i APP_1000000135
+@echo off
\ No newline at end of file
diff --git a/oxalis-dist/oxalis-standalone/example.sh b/oxalis-dist/oxalis-standalone/example.sh
new file mode 100644
index 0000000000000000000000000000000000000000..f3806d898045077e64e577b5c2dfb2cdb9323af3
--- /dev/null
+++ b/oxalis-dist/oxalis-standalone/example.sh
@@ -0,0 +1,164 @@
+#!/bin/bash
+#
+# Author: Steinar O. Cook
+#
+# Sample program illustrating how a single file may be sent using the stand alone client.
+#
+# The -t option switches the trace facility on
+#
+#
+TRACE=""
+
+# The default is to send the sample document to our own access point running on our own machine.
+URL="https://localhost:8080/oxalis/as2"
+
+# The URL and the METHOD must correspond
+METHOD="as2"
+
+# The AS2 destination system identifier has to be specified when using AS2 (X.509 common name of receiver)
+AS2SID="APP_1000000XXX"
+
+FILE="./src/test/resources/BII04_T10_PEPPOL-v2.0_invoice.xml"
+DOC_TYPE_OPTION=""
+
+# Difi PEPPOL Participant Identifier for test purposes.
+# Check reception at https://test-aksesspunkt.difi.no/inbound/9908_810418052/
+RECEIVER="9908:810418052"
+
+SENDER="9908:810017902"
+PROFILE="urn:www.cenbii.eu:profile:bii04:ver1.0"
+
+# Location of the executable program
+EXECUTABLE="target/oxalis-standalone.jar"
+
+function usage() {
+ cat <
+
+
+
+ 4.0.0
+
+
+ dk.erst.oxalis
+ oxalis
+ 0.9.0-e2f4121ccb55b5a60e6edebf7b28d277741d6789
+ ../../pom.xml
+
+
+ oxalis-standalone
+ jar
+
+ Oxalis :: Dist :: Standalone
+ Standalone CLI program which may be used for sending a PEPPOL document.
+ https://rep.erst.dk/git/openebusiness/nemhandeledelivery/oxalis
+
+
+ Erhvervsstyrelsen
+ https://nemhandel.dk/
+
+
+
+
+
+
+ dk.erst.oxalis
+ oxalis-outbound
+
+
+
+ dk.erst.oxalis
+ oxalis-test
+ test
+
+
+
+
+ ch.qos.logback
+ logback-classic
+
+
+ org.slf4j
+ jul-to-slf4j
+
+
+
+ net.sf.jopt-simple
+ jopt-simple
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.4.1
+
+
+ package
+
+ shade
+
+
+ oxalis-standalone
+
+
+ reference.conf
+
+
+ eu.sendregning.oxalis.Main
+
+
+
+
+ *:*
+
+ META-INF/*.SF
+ META-INF/*.DSA
+ META-INF/*.RSA
+
+
+
+
+
+
+
+
+ maven-jar-plugin
+
+
+
+ true
+ true
+
+
+
+
+
+ maven-resources-plugin
+
+
+ rename-jar
+ package
+
+ copy-resources
+
+
+ ../../target
+
+
+ ${project.build.directory}
+
+ oxalis-standalone.jar
+
+
+
+
+
+
+
+
+
+
+
+
+ dist
+
+
+
+ maven-assembly-plugin
+
+
+ src/main/assembly/assembly-full.xml
+
+
+
+
+ create-distribution-package
+ package
+
+ single
+
+
+
+
+
+ maven-resources-plugin
+
+
+ copy-resources
+ package
+
+ copy-resources
+
+
+ ../../target
+
+
+ ${project.build.directory}/${project.build.finalName}-full
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oxalis-dist/oxalis-standalone/src/main/assembly/assembly-full.xml b/oxalis-dist/oxalis-standalone/src/main/assembly/assembly-full.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1a9cb04bf3dd2b086a2657b9469e0e0c463401dc
--- /dev/null
+++ b/oxalis-dist/oxalis-standalone/src/main/assembly/assembly-full.xml
@@ -0,0 +1,51 @@
+
+
+
+ full
+
+ dir
+
+
+ false
+
+
+ src/main/assembly/full
+ /oxalis-standalone
+
+ */**/.gitignore
+
+
+
+
+
+ oxalis-standalone/lib
+
+
+ oxalis-standalone/lib
+
+ network.oxalis:oxalis-extension-currenthome
+
+
+
+
\ No newline at end of file
diff --git a/oxalis-dist/oxalis-standalone/src/main/assembly/full/bin/run.bat b/oxalis-dist/oxalis-standalone/src/main/assembly/full/bin/run.bat
new file mode 100644
index 0000000000000000000000000000000000000000..a2b5a5a5d462ec5dec1909a6e2a077d251b289c2
--- /dev/null
+++ b/oxalis-dist/oxalis-standalone/src/main/assembly/full/bin/run.bat
@@ -0,0 +1,4 @@
+@echo off
+cd %0\..\..
+
+java %JAVA_OPTS% -classpath conf/*;lib/*;ext/* eu.sendregning.oxalis.Main %*
\ No newline at end of file
diff --git a/oxalis-dist/oxalis-standalone/src/main/assembly/full/bin/run.sh b/oxalis-dist/oxalis-standalone/src/main/assembly/full/bin/run.sh
new file mode 100644
index 0000000000000000000000000000000000000000..48ec4832f2f1ee0581a3eb7f5f667ecb5db7843f
--- /dev/null
+++ b/oxalis-dist/oxalis-standalone/src/main/assembly/full/bin/run.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cd $(dirname $(readlink -f $0))/..
+
+exec java $JAVA_OPTS -classpath conf/*:lib/*:ext/* eu.sendregning.oxalis.Main $@
\ No newline at end of file
diff --git a/oxalis-dist/oxalis-standalone/src/main/assembly/full/conf/.gitkeep b/oxalis-dist/oxalis-standalone/src/main/assembly/full/conf/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/oxalis-dist/oxalis-standalone/src/main/assembly/full/ext/.gitkeep b/oxalis-dist/oxalis-standalone/src/main/assembly/full/ext/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/oxalis-dist/oxalis-standalone/src/main/assembly/full/inbound/.gitkeep b/oxalis-dist/oxalis-standalone/src/main/assembly/full/inbound/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/oxalis-dist/oxalis-standalone/src/main/assembly/full/plugin/.gitkeep b/oxalis-dist/oxalis-standalone/src/main/assembly/full/plugin/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/oxalis-dist/oxalis-standalone/src/main/bash/send-self.sh b/oxalis-dist/oxalis-standalone/src/main/bash/send-self.sh
new file mode 100644
index 0000000000000000000000000000000000000000..c222116178a53690d2b0d51d4d4b58f2bdf08b3f
--- /dev/null
+++ b/oxalis-dist/oxalis-standalone/src/main/bash/send-self.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+#
+# Sends sample invoice to ourselves
+#
+
+PRG="$0"
+
+# Name of directory from which this program is being executed, should normally result in the bin/ directory
+# of the distribution.
+PRGDIR=`dirname $0`
+
+
+RECEIVER="9908:983995691"
+
+# PEPPOL Participant id for Difi
+DIFI_TEST="9908:810418052"
+
+#
+# Allows overriding from command line
+#
+for i in "$@"
+do
+ case $i in
+ -r=*)
+ RECEIVER="${i#*=}"
+ shift
+ ;;
+ esac
+done
+
+echo "Sender eksempel faktura (bare tull) fra og til oss selv"
+
+JARFILE=$PRGDIR/oxalis-standalone.jar
+
+if [ ! -r "$JARFILE" ]; then
+ echo "$JARFILE not found"
+ exit 4
+fi
+
+java -jar $JARFILE -f ./sample-invoice.xml -s 9908:976098897 -r ${RECEIVER} -u http://localhost:8080/oxalis/as2 -m as2 -i APP_1000000270 -e data/evidence
+
+# --cert /Users/steinar/.oxalis/difi-cert.pem \
+# -u http://localhost:8080/oxalis/as2 -f /var/peppol/samples/hfcEHF_P205044_P3746797_5684_HF_PTI_161107_2115_11897047_216879680363.XML
\ No newline at end of file
diff --git a/oxalis-dist/oxalis-standalone/src/main/java/eu/sendregning/oxalis/Main.java b/oxalis-dist/oxalis-standalone/src/main/java/eu/sendregning/oxalis/Main.java
new file mode 100644
index 0000000000000000000000000000000000000000..2cd46ca0eab4a147be1efc2fea9a1172d32b14dd
--- /dev/null
+++ b/oxalis-dist/oxalis-standalone/src/main/java/eu/sendregning/oxalis/Main.java
@@ -0,0 +1,380 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package eu.sendregning.oxalis;
+
+import com.google.common.io.ByteStreams;
+import com.google.inject.Key;
+import com.google.inject.name.Names;
+import joptsimple.OptionParser;
+import joptsimple.OptionSet;
+import joptsimple.OptionSpec;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.commons.certvalidator.Validator;
+import network.oxalis.api.model.TransmissionIdentifier;
+import network.oxalis.outbound.OxalisOutboundComponent;
+import network.oxalis.vefa.peppol.common.model.*;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+
+import java.io.*;
+import java.net.URI;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.OptionalDouble;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author Steinar O. Cook
+ * @author Nigel Parker
+ * @author Thore Johnsen
+ * @author erlend
+ *
+ * @author aaron-kumar
+ * @since 5.0.0
+ */
+@Slf4j
+public class Main {
+
+ private static OptionSpec fileSpec;
+
+ private static OptionSpec sender;
+
+ private static OptionSpec recipient;
+
+ private static OptionSpec docType; // The PEPPOL document type (very long string)
+
+ private static OptionSpec profileType; // The PEPPOL document profile
+
+ private static OptionSpec evidencePath; // Path to persistent storage of evidence data
+
+ private static OptionSpec useRequestFactory;
+
+ private static OptionSpec repeatCount;
+
+ private static OptionSpec destinationUrl;
+
+ private static OptionSpec destinationCertificate;
+
+ private static OptionSpec protocol;
+
+ private static OptionSpec maxTransmissions; // Maximum number of transmissions no matter what
+
+ private static OptionSpec probe;
+
+ private static OptionSpec tag;
+
+ private static OptionSpec sleep;
+
+ public static void main(String[] args) throws Exception {
+
+ OptionParser optionParser = getOptionParser();
+
+ if (args.length == 0) {
+ System.out.println();
+ optionParser.printHelpOn(System.out);
+ System.out.println();
+ System.out.println("Configure logging: java -Dlogback.configurationFile=/path/to/config.xml -jar options");
+ return;
+ }
+
+ OptionSet optionSet;
+
+ try {
+ optionSet = optionParser.parse(args);
+ } catch (Exception e) {
+ printErrorMessage(e.getMessage());
+ return;
+ }
+
+ // bootstraps the Oxalis outbound module
+ OxalisOutboundComponent oxalisOutboundComponent = new OxalisOutboundComponent();
+ TransmissionParameters params = new TransmissionParameters(oxalisOutboundComponent);
+
+ // Verifies the existence of a directory in which transmission evidence is stored.
+ File evidencePath = Main.evidencePath.value(optionSet);
+ if (evidencePath == null) {
+ evidencePath = new File("."); // Default is current directory
+ }
+ if (!evidencePath.exists() || !evidencePath.isDirectory()) {
+ printErrorMessage(evidencePath + " does not exist or is not a directory");
+ }
+ params.setEvidencePath(evidencePath);
+
+ // Tag
+ params.setTag(tag.value(optionSet));
+
+ // --- Use Factory
+ params.setUseFactory(useRequestFactory.value(optionSet));
+
+ // --- Recipient
+ String recipientId = recipient.value(optionSet);
+ if (recipientId != null) {
+ params.setReceiver(ParticipantIdentifier.of(recipientId));
+ }
+
+ // --- Sender
+ String senderId = sender.value(optionSet);
+ if (senderId != null) {
+ params.setSender(ParticipantIdentifier.of(senderId));
+ }
+
+ // --- Document type
+ if (docType != null && docType.value(optionSet) != null) {
+ String value = docType.value(optionSet);
+ params.setDocType(DocumentTypeIdentifier.of(value));
+ }
+
+ // --- Process type
+ if (profileType != null && profileType.value(optionSet) != null) {
+ String value = profileType.value(optionSet);
+ params.setProcessIdentifier(ProcessIdentifier.of(value));
+ }
+
+ if (probe.value(optionSet)) {
+ CloseableHttpClient httpClient = oxalisOutboundComponent.getInjector()
+ .getInstance(CloseableHttpClient.class);
+ try (CloseableHttpResponse response = httpClient.execute(new HttpGet(destinationUrl.value(optionSet)))) {
+ ByteStreams.copy(response.getEntity().getContent(), System.out);
+ }
+ } else {
+ // --- Destination URL, protocl and system identifier
+ if (optionSet.has(destinationUrl) && !probe.value(optionSet)) {
+ String destinationString = destinationUrl.value(optionSet);
+
+ X509Certificate certificate;
+ try (InputStream inputStream = new FileInputStream(destinationCertificate.value(optionSet))) {
+ certificate = Validator.getCertificate(inputStream);
+ }
+
+ params.setEndpoint(Endpoint.of(
+ TransportProfile.of(protocol.value(optionSet)),
+ URI.create(destinationString),
+ certificate));
+ }
+
+ // Retrieves the name of the file to be transmitted
+ String payloadFileSpec = fileSpec.value(optionSet);
+
+ List files = locateFiles(payloadFileSpec);
+
+
+ System.out.println();
+ System.out.println();
+
+ int repeats = optionSet.valueOf(repeatCount);
+ int maximumTransmissions = optionSet.valueOf(maxTransmissions);
+
+ ExecutorService exec = oxalisOutboundComponent.getInjector()
+ .getInstance(Key.get(ExecutorService.class, Names.named("default")));
+ ExecutorCompletionService ecs = new ExecutorCompletionService<>(exec);
+
+ long start = System.nanoTime();
+ int submittedTaskCount = 0;
+ for (File file : files) {
+
+ if (!file.isFile() || !file.canRead()) {
+ log.error("File " + file + " is not a file or can not be read, skipping...");
+ continue;
+ }
+
+ for (int i = 0; i < repeats; i++) {
+ TransmissionTask transmissionTask = new TransmissionTask(params, file);
+
+ Future submit = ecs.submit(transmissionTask);
+ submittedTaskCount++;
+ if (submittedTaskCount > maximumTransmissions) {
+ log.info("Stopped submitting tasks at {} " + submittedTaskCount);
+ break;
+ }
+ }
+ if (submittedTaskCount > maximumTransmissions) {
+ break;
+ }
+ }
+
+ // Wait for the results to be available
+ List results = new ArrayList<>();
+ int failed = 0;
+ for (int i = 0; i < submittedTaskCount; i++) {
+ try {
+ Future future = ecs.take();
+ TransmissionResult transmissionResult = future.get();
+ results.add(transmissionResult);
+ } catch (InterruptedException e) {
+ System.err.println(e.getMessage());
+ } catch (ExecutionException e) {
+ log.error("Execution failed: {}", e.getMessage(), e);
+ failed++;
+ }
+ }
+
+ long elapsed = System.nanoTime() - start;
+
+ exec.shutdownNow(); // Shuts down the executor service
+
+ for (TransmissionResult transmissionResult : results) {
+ TransmissionIdentifier transmissionIdentifier = transmissionResult.getTransmissionIdentifier();
+ System.out.println(String.format("%s transmission took %s ms",
+ transmissionIdentifier, transmissionResult.getDuration()));
+ }
+
+ OptionalDouble average = results.stream().mapToLong(TransmissionResult::getDuration).average();
+
+ if (average.isPresent()) {
+ System.out.println("Average transmission time was " + average.getAsDouble() + "ms");
+ }
+ long elapsedInSeconds = TimeUnit.SECONDS.convert(elapsed, TimeUnit.NANOSECONDS);
+ System.out.println("Total time spent: " + elapsedInSeconds + "s");
+ System.out.println("Attempted to send " + results.size() + " files");
+ System.out.println("Failed transmissions: " + failed);
+ if (results.size() > 0 && elapsedInSeconds > 0) {
+ System.out.println("Transmission speed " + results.size() / elapsedInSeconds + " documents per second");
+ }
+
+ // Sleep if set to do so.
+ Integer sleepSecs = sleep.value(optionSet);
+ if (sleepSecs > 0) {
+ Thread.sleep(sleepSecs * 1000);
+ }
+
+ System.exit(failed == 0 ? 0 : 1);
+ }
+ }
+
+ /**
+ * Locates the files to load and transmit.
+ *
+ * @param payloadFileSpec specifies the name of the file or the directory holding files to be transmitted.
+ * @return list of eligible files.
+ */
+ static List locateFiles(String payloadFileSpec) {
+
+ List files = new ArrayList<>();
+ if ("-".equals(payloadFileSpec)) {
+
+ // Reads list of files from stdin
+ try (Reader reader = new InputStreamReader(System.in);
+ BufferedReader bufferedReader = new BufferedReader(reader)) {
+ files = bufferedReader.lines()
+ .map(File::new)
+ .collect(Collectors.toList());
+ } catch (IOException e) {
+ log.warn(e.getMessage(), e);
+ }
+ } else {
+ File fileSpec = new File(payloadFileSpec);
+ if (!fileSpec.exists()) {
+ log.warn(String.format("'%s' does not exists.", fileSpec.getAbsolutePath()));
+ } else if (fileSpec.isDirectory()) {
+ try (DirectoryStream stream = Files.newDirectoryStream(Paths.get(payloadFileSpec), "*.{XML,xml}")) {
+ for (Path path : stream) {
+ files.add(path.toFile());
+ }
+
+ } catch (IOException e) {
+ throw new IllegalStateException(
+ String.format("Unable to list files %s; %s", payloadFileSpec, e.getMessage()), e);
+ }
+ } else if (fileSpec.isFile()) {
+ files.add(fileSpec);
+ } else {
+ log.warn(String.format("'%s' is neither file nor directory.", fileSpec.getAbsoluteFile()));
+ }
+ }
+
+ return files;
+ }
+
+
+ private static void printErrorMessage(String message) {
+ System.out.println();
+ System.out.println("*** " + message);
+ System.out.println();
+ }
+
+ static OptionParser getOptionParser() {
+ OptionParser optionParser = new OptionParser();
+
+ fileSpec = optionParser.accepts("f", "File(s) to be transmitted")
+ .withRequiredArg().ofType(String.class);
+
+ docType = optionParser.accepts("d", "Document type")
+ .withRequiredArg();
+ profileType = optionParser.accepts("p", "Profile type")
+ .withRequiredArg();
+ sender = optionParser.accepts("s", "sender [e.g. 9908:976098897]")
+ .withRequiredArg();
+ recipient = optionParser.accepts("r", "recipient [e.g. 9908:976098897]")
+ .withRequiredArg();
+
+ evidencePath = optionParser.accepts("e", "Evidence storage dir")
+ .withRequiredArg().ofType(File.class);
+ useRequestFactory = optionParser.accepts("factory", "Use TransmissionRequestFactory (no overrides!)")
+ .withOptionalArg().ofType(Boolean.class).defaultsTo(false);
+ repeatCount = optionParser.accepts("repeat", "Number of repeats to use ")
+ .withRequiredArg().ofType(Integer.class).defaultsTo(1);
+
+ probe = optionParser.accepts("probe", "Perform probing of endpoint.")
+ .withRequiredArg().ofType(Boolean.class).defaultsTo(false);
+
+ destinationUrl = optionParser.accepts("u", "destination URL")
+ .requiredIf(probe, protocol).withRequiredArg();
+ destinationCertificate = optionParser.accepts("cert", "Receiving AP's certificate (when overriding endpoint)")
+ .requiredIf(destinationUrl).withRequiredArg().ofType(File.class);
+
+ protocol = optionParser.accepts("protocol", "Protocol to be used")
+ .withRequiredArg().ofType(String.class).defaultsTo(TransportProfile.AS2_1_0.getIdentifier());
+
+ maxTransmissions = optionParser.accepts("m", "Max number of transmissions")
+ .withRequiredArg().ofType(Integer.class).defaultsTo(Integer.MAX_VALUE);
+
+ tag = optionParser.accepts("tag", "User defined tag")
+ .withRequiredArg();
+
+ sleep = optionParser.accepts("sleep", "Sleep standalone for x seconds after transmission.")
+ .withRequiredArg().ofType(Integer.class).defaultsTo(0);
+
+ return optionParser;
+ }
+
+ @SuppressWarnings("unused")
+ private static String enterPassword() {
+ System.out.print("Keystore password: ");
+ String password = null;
+
+ try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(System.in))) {
+ password = bufferedReader.readLine();
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ System.exit(1);
+ }
+ return password;
+ }
+}
diff --git a/oxalis-dist/oxalis-standalone/src/main/java/eu/sendregning/oxalis/TransmissionParameters.java b/oxalis-dist/oxalis-standalone/src/main/java/eu/sendregning/oxalis/TransmissionParameters.java
new file mode 100644
index 0000000000000000000000000000000000000000..24c75c733ef279c0f4d8c359825c3af6deaaae5e
--- /dev/null
+++ b/oxalis-dist/oxalis-standalone/src/main/java/eu/sendregning/oxalis/TransmissionParameters.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package eu.sendregning.oxalis;
+
+import network.oxalis.api.tag.Tag;
+import network.oxalis.outbound.OxalisOutboundComponent;
+import network.oxalis.vefa.peppol.common.model.DocumentTypeIdentifier;
+import network.oxalis.vefa.peppol.common.model.Endpoint;
+import network.oxalis.vefa.peppol.common.model.ParticipantIdentifier;
+import network.oxalis.vefa.peppol.common.model.ProcessIdentifier;
+
+import java.io.File;
+import java.util.Optional;
+
+/**
+ * @author steinar
+ * Date: 08.01.2017
+ * Time: 13.06
+ * @author erlend
+ */
+class TransmissionParameters {
+
+ private ParticipantIdentifier receiver;
+
+ private ParticipantIdentifier sender;
+
+ private DocumentTypeIdentifier docType;
+
+ private ProcessIdentifier processIdentifier;
+
+ private Endpoint endpoint;
+
+ private File evidencePath;
+
+ private String tag;
+
+ private boolean useFactory;
+
+ private OxalisOutboundComponent oxalisOutboundComponent;
+
+ public TransmissionParameters(OxalisOutboundComponent oxalisOutboundComponent) {
+ this.oxalisOutboundComponent = oxalisOutboundComponent;
+ }
+
+ public Optional getReceiver() {
+ return Optional.ofNullable(receiver);
+ }
+
+ public void setReceiver(ParticipantIdentifier receiver) {
+ this.receiver = receiver;
+ }
+
+ public Optional getSender() {
+ return Optional.ofNullable(sender);
+ }
+
+ public void setSender(ParticipantIdentifier sender) {
+ this.sender = sender;
+ }
+
+ public Optional getDocType() {
+ return Optional.ofNullable(docType);
+ }
+
+ public void setDocType(DocumentTypeIdentifier documentTypeIdentifier) {
+ this.docType = documentTypeIdentifier;
+ }
+
+ public Optional getProcessIdentifier() {
+ return Optional.ofNullable(processIdentifier);
+ }
+
+ public void setProcessIdentifier(ProcessIdentifier processIdentifier) {
+ this.processIdentifier = processIdentifier;
+ }
+
+ public File getEvidencePath() {
+ return evidencePath;
+ }
+
+ public void setEvidencePath(File evidencePath) {
+ this.evidencePath = evidencePath;
+ }
+
+ public OxalisOutboundComponent getOxalisOutboundComponent() {
+ return oxalisOutboundComponent;
+ }
+
+ public boolean isUseFactory() {
+ return useFactory;
+ }
+
+ public void setUseFactory(boolean useFactory) {
+ this.useFactory = useFactory;
+ }
+
+ public Optional getEndpoint() {
+ return Optional.ofNullable(endpoint);
+ }
+
+ public void setEndpoint(Endpoint endpoint) {
+ this.endpoint = endpoint;
+ }
+
+ public Tag getTag() {
+ return this.tag == null ? Tag.NONE : Tag.of(this.tag);
+ }
+
+ public void setTag(String tag) {
+ this.tag = tag;
+ }
+}
diff --git a/oxalis-dist/oxalis-standalone/src/main/java/eu/sendregning/oxalis/TransmissionResult.java b/oxalis-dist/oxalis-standalone/src/main/java/eu/sendregning/oxalis/TransmissionResult.java
new file mode 100644
index 0000000000000000000000000000000000000000..a38a35429ac6a8c546209925e5983e318ef18b1f
--- /dev/null
+++ b/oxalis-dist/oxalis-standalone/src/main/java/eu/sendregning/oxalis/TransmissionResult.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package eu.sendregning.oxalis;
+
+import network.oxalis.api.model.TransmissionIdentifier;
+
+/**
+ * @author steinar
+ * Date: 07.01.2017
+ * Time: 22.44
+ */
+public class TransmissionResult {
+
+ private final long duration;
+
+ private final TransmissionIdentifier transmissionIdentifier;
+
+
+ public TransmissionResult(long duration, TransmissionIdentifier transmissionIdentifier) {
+ this.duration = duration;
+ this.transmissionIdentifier = transmissionIdentifier;
+ }
+
+ public long getDuration() {
+ return duration;
+ }
+
+ public TransmissionIdentifier getTransmissionIdentifier() {
+ return transmissionIdentifier;
+ }
+}
diff --git a/oxalis-dist/oxalis-standalone/src/main/java/eu/sendregning/oxalis/TransmissionTask.java b/oxalis-dist/oxalis-standalone/src/main/java/eu/sendregning/oxalis/TransmissionTask.java
new file mode 100644
index 0000000000000000000000000000000000000000..98dd9963936f0bcf652b77d6d9f2c45eb1644187
--- /dev/null
+++ b/oxalis-dist/oxalis-standalone/src/main/java/eu/sendregning/oxalis/TransmissionTask.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package eu.sendregning.oxalis;
+
+import io.opentracing.Span;
+import io.opentracing.Tracer;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.api.evidence.EvidenceFactory;
+import network.oxalis.api.lang.EvidenceException;
+import network.oxalis.api.lang.OxalisTransmissionException;
+import network.oxalis.api.outbound.TransmissionRequest;
+import network.oxalis.api.outbound.TransmissionResponse;
+import network.oxalis.api.outbound.Transmitter;
+import network.oxalis.commons.filesystem.FileUtils;
+import network.oxalis.outbound.transmission.TransmissionRequestBuilder;
+import network.oxalis.vefa.peppol.common.model.Endpoint;
+
+import java.io.*;
+import java.nio.file.Files;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author steinar
+ * Date: 07.01.2017
+ * Time: 22.43
+ */
+@Slf4j
+public class TransmissionTask implements Callable {
+
+ private final TransmissionParameters params;
+
+ private final File xmlPayloadFile;
+
+ private final EvidenceFactory evidenceFactory;
+
+ private final Tracer tracer;
+
+ public TransmissionTask(TransmissionParameters params, File xmlPayloadFile) {
+ this.params = params;
+ this.xmlPayloadFile = xmlPayloadFile;
+
+ this.evidenceFactory = params.getOxalisOutboundComponent().getEvidenceFactory();
+ this.tracer = params.getOxalisOutboundComponent().getInjector().getInstance(Tracer.class);
+ }
+
+ @Override
+ public TransmissionResult call() throws Exception {
+ Span span = tracer.buildSpan("standalone").start();
+ try {
+ TransmissionResponse transmissionResponse;
+ long duration = 0;
+
+ if (params.isUseFactory()) {
+ try (InputStream inputStream = Files.newInputStream(xmlPayloadFile.toPath())) {
+ transmissionResponse = params.getOxalisOutboundComponent()
+ .getTransmissionService()
+ .send(inputStream, params.getTag(), span);
+ }
+ } else {
+
+ TransmissionRequest transmissionRequest = createTransmissionRequest(span);
+
+ Transmitter transmitter;
+ Span span1 = tracer.buildSpan("get transmitter").asChildOf(span).start();
+ try {
+ transmitter = params.getOxalisOutboundComponent().getTransmitter();
+ } finally {
+ span1.finish();
+ }
+
+ // Performs the transmission
+ long start = System.nanoTime();
+ transmissionResponse = performTransmission(
+ params.getEvidencePath(), transmitter, transmissionRequest, span);
+ long elapsed = System.nanoTime() - start;
+ duration = TimeUnit.MILLISECONDS.convert(elapsed, TimeUnit.NANOSECONDS);
+
+ return new TransmissionResult(duration, transmissionResponse.getTransmissionIdentifier());
+ }
+ return new TransmissionResult(duration, transmissionResponse.getTransmissionIdentifier());
+ } finally {
+ span.finish();
+ }
+ }
+
+ protected TransmissionRequest createTransmissionRequest(Span root) {
+ Span span = tracer.buildSpan("create transmission request").asChildOf(root).start();
+ try {
+ // creates a transmission request builder and enables trace
+ TransmissionRequestBuilder requestBuilder =
+ params.getOxalisOutboundComponent().getTransmissionRequestBuilder();
+
+ requestBuilder.setTransmissionBuilderOverride(true);
+
+ // add receiver participant
+ if (params.getReceiver().isPresent()) {
+ requestBuilder.receiver(params.getReceiver().get());
+ }
+
+ // add sender participant
+ if (params.getSender().isPresent()) {
+ requestBuilder.sender(params.getSender().get());
+ }
+
+ if (params.getDocType().isPresent()) {
+ requestBuilder.documentType(params.getDocType().get());
+ }
+
+ if (params.getProcessIdentifier().isPresent()) {
+ requestBuilder.processType(params.getProcessIdentifier().get());
+ }
+
+ // Supplies the payload
+ try (InputStream inputStream = new FileInputStream(xmlPayloadFile)) {
+ requestBuilder.payLoad(inputStream);
+ }
+
+ // Overrides the destination URL if so requested
+ if (params.getEndpoint().isPresent()) {
+ final Endpoint endpoint = params.getEndpoint().get();
+ requestBuilder.overrideAs2Endpoint(endpoint);
+ }
+
+ // Specifying the details completed, creates the transmission request
+ return requestBuilder.build(span);
+ } catch (Exception e) {
+ span.setTag("exception", String.valueOf(e.getMessage()));
+ System.out.println();
+ System.out.println("Message failed : " + e.getMessage());
+ //e.printStackTrace();
+ System.out.println();
+ return null;
+ } finally {
+ span.finish();
+ }
+ }
+
+ protected TransmissionResponse performTransmission(File evidencePath, Transmitter transmitter,
+ TransmissionRequest transmissionRequest, Span root)
+ throws OxalisTransmissionException, EvidenceException, IOException {
+ Span span = tracer.buildSpan("transmission").asChildOf(root).start();
+ try {
+ // ... and performs the transmission
+ long start = System.nanoTime();
+ TransmissionResponse transmissionResponse = transmitter.transmit(transmissionRequest, span);
+ long elapsed = System.nanoTime() - start;
+
+ long durartionInMs = TimeUnit.MILLISECONDS.convert(elapsed, TimeUnit.NANOSECONDS);
+ // Write the transmission id and where the message was delivered
+ log.debug(String.format("Message using messageId %s sent to %s using %s was assigned transmissionId %s took %dms\n",
+ transmissionResponse.getHeader().getIdentifier().getIdentifier(),
+ transmissionResponse.getEndpoint().getAddress(),
+ transmissionResponse.getProtocol().getIdentifier(),
+ transmissionResponse.getTransmissionIdentifier(),
+ durartionInMs
+ ));
+
+ saveEvidence(transmissionResponse, evidencePath, span);
+
+ return transmissionResponse;
+ } finally {
+ span.finish();
+ }
+ }
+
+ protected void saveEvidence(TransmissionResponse transmissionResponse, File evidencePath, Span root)
+ throws IOException, EvidenceException {
+ Span span = tracer.buildSpan("save evidence").asChildOf(root).start();
+
+ String transIdent = FileUtils.filterString(transmissionResponse.getTransmissionIdentifier().toString());
+ File evidenceFile = new File(evidencePath, transIdent + ".receipt.dat");
+
+ try (OutputStream outputStream = Files.newOutputStream(evidenceFile.toPath())) {
+ evidenceFactory.write(outputStream, transmissionResponse);
+ } finally {
+ span.finish();
+ }
+ }
+}
diff --git a/oxalis-dist/oxalis-standalone/src/main/resources/logback.xml b/oxalis-dist/oxalis-standalone/src/main/resources/logback.xml
new file mode 100644
index 0000000000000000000000000000000000000000..55bf20d4bef4d3eec6d456e4075990da80995f80
--- /dev/null
+++ b/oxalis-dist/oxalis-standalone/src/main/resources/logback.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+ %d %p [%c] %m %n
+
+
+
+
+
+
+
+
+
+
diff --git a/oxalis-dist/oxalis-standalone/src/test/java/eu/sendregning/oxalis/MainTest.java b/oxalis-dist/oxalis-standalone/src/test/java/eu/sendregning/oxalis/MainTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..a8bfb5b1996283bc295ce82dadefcf9c1c470267
--- /dev/null
+++ b/oxalis-dist/oxalis-standalone/src/test/java/eu/sendregning/oxalis/MainTest.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package eu.sendregning.oxalis;
+
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.testng.Assert.assertEquals;
+
+/**
+ * @author steinar
+ * Date: 08.01.2017
+ * Time: 13.53
+ */
+public class MainTest {
+
+
+ private Path tempDirectory;
+
+ private Path tempFile;
+
+ private Path tempFile2;
+
+ private Path fileHoldingFileNames;
+
+ @BeforeMethod
+ public void setUp() throws Exception {
+ tempDirectory = Files.createTempDirectory("unit");
+
+ tempFile = Files.createTempFile(tempDirectory, "TEST", ".xml");
+ tempFile2 = Files.createTempFile(tempDirectory, "TEST2", ".xml");
+
+ fileHoldingFileNames = Files.createTempFile("test", ".txt");
+
+ List fileNames = Arrays.asList(tempFile.toString(), tempFile2.toString());
+ Files.write(fileHoldingFileNames, fileNames);
+ }
+
+
+ /**
+ * Files may be located using any of the following specifications:
+ *
+ *
+ * - A single hyphen '-' indicates read list of files from stdin, one file per line
+ * - A file referencing a file is, well a single file
+ * - A file referencing a directory, indicates that all .xml files in that directory should be read
+ * - A specification using '*' should be expanded
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testLocateFiles() throws Exception {
+
+ List files = Main.locateFiles(tempDirectory.toString());
+
+ assertEquals(files.size(), 2);
+
+ files = Main.locateFiles(tempFile.toString());
+ assertEquals(1, files.size());
+ }
+
+ @Test
+ public void testStdin() throws Exception {
+
+ InputStream saved = System.in;
+
+ System.setIn( new FileInputStream(fileHoldingFileNames.toFile()) );
+
+ List files = Main.locateFiles("-");
+ assertEquals(2, files.size());
+ System.setIn(saved);
+
+ }
+}
+
diff --git a/oxalis-dist/oxalis-standalone/src/test/resources/BII04_T10_EHF-v2.0_invoice.xml b/oxalis-dist/oxalis-standalone/src/test/resources/BII04_T10_EHF-v2.0_invoice.xml
new file mode 100644
index 0000000000000000000000000000000000000000..32c3224cf12e54c72bf722a203d0229c03172260
--- /dev/null
+++ b/oxalis-dist/oxalis-standalone/src/test/resources/BII04_T10_EHF-v2.0_invoice.xml
@@ -0,0 +1,495 @@
+
+
+
+
+ 2.1
+ urn:www.cenbii.eu:transaction:biitrns010:ver2.0:extended:urn:www.peppol.eu:bis:peppol4a:ver2.0:extended:urn:www.difi.no:ehf:faktura:ver2.0
+ urn:www.cenbii.eu:profile:bii04:ver2.0
+ TOSL108
+ 2009-12-15
+ 380
+ Ordered in our booth at the convention.
+ 2009-11-30
+ EUR
+ Project cost code 123
+
+ 2009-11-01
+ 2009-11-30
+
+
+ 123
+
+
+ Contract321
+ Framework agreement
+
+
+ Doc1
+ Timesheet
+
+
+ http://www.suppliersite.eu/sheet001.html
+
+
+
+
+ Doc2
+ Drawing
+
+ JVBERi0xLjQNCiW1tbW1DQoxIDAgb2JqDQo8PC9UeXBlL0NhdGFsb2cvUGFnZXMgMiAwIFIvTGFuZyhuYi1OTykgL091dHB1dEludGVudHNbPDwvVHlwZS9PdXRwdXRJbnRlbnQvUy9HVFNfUERGQTEvT3V0cHV0Q29uZGl0aW9uSWRlbnRpZmllcihzUkdCKSAvUmVnaXN0cnlOYW1lKGh0dHA6Ly93d3cuY29sb3Iub3JnKSAvSW5mbyhDcmVhdG9yOiBIUCAgICAgTWFudWZhY3R1cmVyOklFQyAgICBNb2RlbDpzUkdCKSAvRGVzdE91dHB1dFByb2ZpbGUgMTEgMCBSPj5dIC9NZXRhZGF0YSAxMiAwIFI+Pg0KZW5kb2JqDQoyIDAgb2JqDQo8PC9UeXBlL1BhZ2VzL0NvdW50IDEvS2lkc1sgMyAwIFJdID4+DQplbmRvYmoNCjMgMCBvYmoNCjw8L1R5cGUvUGFnZS9QYXJlbnQgMiAwIFIvUmVzb3VyY2VzPDwvRm9udDw8L0YxIDUgMCBSPj4vUHJvY1NldFsvUERGL1RleHQvSW1hZ2VCL0ltYWdlQy9JbWFnZUldID4+L01lZGlhQm94WyAwIDAgNTk1LjMyIDg0MS45Ml0gL0NvbnRlbnRzIDQgMCBSPj4NCmVuZG9iag0KNCAwIG9iag0KPDwvRmlsdGVyL0ZsYXRlRGVjb2RlL0xlbmd0aCAxMjA+Pg0Kc3RyZWFtDQp4nHMK4eXSdzNUMDTUMzBRCEnj5TJUMABCQwVzAz0LIxMFczMDPTMLhZBcXi4DhXQQ4c7LFa3hqBCgqWus4aKpa6LhpmlorKGQkg9iJ5eCOLkgZmpeiZ5mrEKIFy+XK9AWpxCE2YYmFnpGRshmR2soIKkFAJQwHV8NCmVuZHN0cmVhbQ0KZW5kb2JqDQo1IDAgb2JqDQo8PC9UeXBlL0ZvbnQvU3VidHlwZS9UcnVlVHlwZS9OYW1lL0YxL0Jhc2VGb250L0FCQ0RFRStDYWxpYnJpL0VuY29kaW5nL1dpbkFuc2lFbmNvZGluZy9Gb250RGVzY3JpcHRvciA2IDAgUi9GaXJzdENoYXIgMzIvTGFzdENoYXIgMTE3L1dpZHRocyA4IDAgUj4+DQplbmRvYmoNCjYgMCBvYmoNCjw8L1R5cGUvRm9udERlc2Ny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OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IjMuMS03MDEiPgo8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgo8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIj4KPC9yZGY6RGVzY3JpcHRpb24+CjxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiICB4bWxuczp4bXBSaWdodHM9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9yaWdodHMvIj4KPHhtcFJpZ2h0czpNYXJrZWQ+VHJ1ZTwveG1wUmlnaHRzOk1hcmtlZD48L3JkZjpEZXNjcmlwdGlvbj4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAo8L3JkZjpSREY+PC94OnhtcG1ldGE+PD94cGFja2V0IGVuZD0idyI/Pg0KZW5kc3RyZWFtDQplbmRvYmoNCjExIDAgb2JqDQo8PC9OIDMvRmlsdGVyL0ZsYXRlRGVjb2RlL0xlbmd0aCAyNTkzPj4NCnN0cmVhbQ0KeJydlndUVNcWh8+9d3qhzTB0GHqvUgYQ6R2kV1EYZgYYygDDDNgLIioQUUSkKYIEBQwYDUViRRQLAVEBe0CCgBKDUWyoZEbWSnx5ee/l5ffHPd/aZ+9z99l737UuACQvPy4vHZYCII0n4Ad7utAjo6Lp2H4AAzzAAHMAmKysDP8Qj1Agkre7Kz1L5AT+Ra+HASRebxl7BdLp4P+TNCuDLwAAChTxEjYniyXiPBGn5ggyxPZZEVPjU8QMo8TMFyUoYnkxJy6y0WefRXYSMzuNxxaxOOcMdhpbzD0i3pEt5IgY8RNxfjaXkyPi2yLWShWmcUX8VhybxmFmAYAiie0CDitJxGYiJvFDg11FvBQAHCnxC47/ggWc1QLxpVzTM9bwuYlJAroeS59ubmvLoHtxclI5AoFxIJOV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OmFib3V0PSIiICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iPgo8ZGM6Y3JlYXRvcj48cmRmOlNlcT48cmRmOmxpPnRlcmplaW88L3JkZjpsaT48L3JkZjpTZXE+PC9kYzpjcmVhdG9yPjwvcmRmOkRlc2NyaXB0aW9uPgo8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIj4KPHhtcDpDcmVhdG9yVG9vbD5NaWNyb3NvZnTCriBXb3JkIDIwMTA8L3htcDpDcmVhdG9yVG9vbD48eG1wOkNyZWF0ZURhdGU+MjAxMS0wNC0wNlQxOToyOTo0NCswMjowMDwveG1wOkNyZWF0ZURhdGU+PHhtcDpNb2RpZnlEYXRlPjIwMTEtMDQtMDZUMTk6Mjk6NDQrMDI6MDA8L3htcDpNb2RpZnlEYXRlPjwvcmRmOkRlc2NyaXB0aW9uPgo8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiAgeG1sbnM6eGFwTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iPgo8eGFwTU06RG9jdW1lbnRJRD40MjY3QUQyNy1GNDY2LTQ2NzMtOTJEMy1BOTM3RDRCODZFNEU8L3hhcE1NOkRvY3VtZW50SUQ+PHhhcE1NOkluc3RhbmNlSUQ+NDI2N0FEMjctRjQ2Ni00NjczLTkyRDMtQTkzN0Q0Qjg2RTRFPC94YXBNTTpJbnN0YW5jZUlEPjwvcmRmOkRlc2NyaXB0aW9uPgo8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiAgeG1sbnM6cGRmYWlkPSJodHRwOi8vd3d3LmFpaW0ub3JnL3BkZmEvbnMvaWQvIj4KPHBkZmFpZDpwYXJ0PjE8L3BkZmFpZDpwYXJ0PjxwZGZhaWQ6Y29uZm9ybWFuY2U+QjwvcGRmYWlkOmNvbmZvcm1hbmNlPjwvcmRmOkRlc2NyaXB0aW9uPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKPC9yZGY6UkRGPjwveDp4bXBtZXRhPjw/eHBhY2tldCBlbmQ9InciPz4NCmVuZHN0cmVhbQ0KZW5kb2JqDQp4cmVmDQowIDEzDQowMDAwMDAwMDAwIDY1NTM1IGYNCjAwMDAwMDAwMTcgMDAwMDAgbg0KMDAwMDAwMDI5MyAwMDAwMCBuDQowMDAwMDAwMzQ5IDAwMDAwIG4NCjAwMDAwMDA1MTMgMDAwMDAgbg0KMDAwMDAwMDcwNyAwMDAwMCBuDQowMDAwMDAwODc0IDAwMDAwIG4NCjAwMDAwMDExMTIgMDAwMDAgbg0KMDAwMDAwMTMzMiAwMDAwMCBuDQowMDAwMDAxNTU0IDAwMDAwIG4NCjAwMDAwODE3ODMgMDAwMDAgbg0KMDAwMDA4MzMyOSAwMDAwMCBuDQowMDAwMDg2MDAyIDAwMDAwIG4NCnRyYWlsZXINCjw8L1NpemUgMTMvUm9vdCAxIDAgUi9JbmZvIDcgMCBSL0lEWzwyN0FENjc0MjY2RjQ3MzQ2OTJEM0E5MzdENEI4NkU0RT48MjdBRDY3NDI2NkY0NzM0NjkyRDNBOTM3RDRCODZFNEU+XSA+Pg0Kc3RhcnR4cmVmDQo4OTMwMA0KJSVFT0Y=
+
+
+
+
+ 1234567890123
+
+ Supp123
+
+
+ Salescompany ltd.
+
+
+ 1231412341324
+ 5467
+ Main street
+ Suite 123
+ 1
+ Revenue department
+ Big city
+ 54321
+ RegionA
+
+ NO
+
+
+
+ NO999999999MVA
+
+ VAT
+
+
+
+ The Sellercompany Incorporated
+ 810418052
+
+ Big city
+ RegionA
+
+ DK
+
+
+
+
+ O. Hansen
+ 46211230
+ 46211231
+ antonio@salescompany.dk
+
+
+ Antonio
+ Salemacher
+ M
+ Sales manager
+
+
+
+
+
+ 1234567987654
+
+ 345KS5324
+
+
+ Buyercompany ltd
+
+
+ 1238764941386
+ 123
+ Anystreet
+ Back door
+ 8
+ Accounting department
+ Anytown
+ 101
+ RegionB
+
+ BE
+
+
+
+ BE54321
+
+ VAT
+
+
+
+ The buyercompany inc.
+ 810418052
+
+ Mainplace
+ RegionB
+
+ BE
+
+
+
+
+ 3150bdn
+ 5121230
+ 5121231
+ john@buyercompany.eu
+
+
+ John
+ Doe
+ X
+ Purchasing manager
+
+
+
+
+
+ 098740918237
+
+
+ Ebeneser Scrooge Inc.
+
+
+ 6411982340
+
+
+
+ 2009-12-15
+
+ 6754238987648
+
+ Deliverystreet
+ Side door
+ 12
+ DeliveryCity
+ 523427
+ RegionC
+
+ BE
+
+
+
+
+
+ 31
+ 2009-12-31
+ SW
+ Payref1
+
+ NO9386011117947
+
+ 9710
+
+ DNBANOKK
+
+
+
+
+
+ Penalty percentage 10% from due date
+
+
+ true
+ Packing cost
+ 100
+
+ S
+ 25
+
+ VAT
+
+
+
+
+ false
+ Promotion discount
+ 100
+
+ S
+ 25
+
+ VAT
+
+
+
+
+ 292.20
+
+ 1460.5
+ 292.1
+
+ S
+ 25
+
+ VAT
+
+
+
+
+ 1
+ 0.1
+
+ AA
+ 10
+
+ VAT
+
+
+
+
+ -25
+ 0
+
+ E
+ 0
+ AAM
+ Exempt New Means of Transport
+
+ VAT
+
+
+
+
+
+ 1436.5
+ 1436.5
+ 1729
+ 100
+ 100
+ 1000
+ 0.30
+ 729
+
+
+ 1
+ Scratch on box
+ 1
+ 1273
+ BookingCode001
+
+ 1
+
+
+ false
+ Damage
+ 12
+
+
+ true
+ Testing
+ 12
+
+
+ 254.6
+
+
+ Processor: Intel Core 2 Duo SU9400 LV (1.4GHz). RAM: 3MB. Screen 1440x900
+ Laptop computer
+
+ JB007
+
+
+ 1234567890124
+
+
+ 12344321
+
+
+ 65434568
+
+
+ S
+ 25
+
+ VAT
+
+
+
+ Color
+ Black
+
+
+
+ 1273
+ 1
+
+ false
+ Contract
+ 0.15
+ 225
+ 1500
+
+
+
+
+ 2
+ Cover is slightly damaged.
+ -1
+ -3.96
+ BookingCode002
+
+ 5
+
+
+ -0.396
+
+
+ Returned "Advanced computing" book
+
+ JB008
+
+
+ 1234567890125
+
+
+ 32344324
+
+
+ 65434567
+
+
+ AA
+ 10
+
+ VAT
+
+
+
+
+ 3.96
+ 1
+
+
+
+ 3
+ 2
+ 4.96
+ BookingCode003
+
+ 3
+
+
+ 0.496
+
+
+ "Computing for dummies" book
+
+ JB009
+
+
+ 1234567890126
+
+
+ 32344324
+
+
+ 65434566
+
+
+ AA
+ 10
+
+ VAT
+
+
+
+
+ 2.48
+ 1
+
+ false
+ Contract
+ 0.1
+ 0.275
+ 2.75
+
+
+
+
+ 4
+ -1
+ -25
+ BookingCode004
+
+ 2
+
+
+ 0
+
+
+ Returned IBM 5150 desktop
+
+ JB010
+
+
+ 1234567890127
+
+
+ 12344322
+
+
+ 65434565
+
+
+ E
+ 0
+
+ VAT
+
+
+
+
+ 25
+ 1
+
+
+
+ 5
+ 250
+ 187.5
+ BookingCode005
+
+ 4
+
+
+ 37.5
+
+
+ Network cable
+
+ JB011
+
+
+ 1234567890128
+
+
+ 12344325
+
+
+ 65434564
+
+
+ S
+ 25
+
+ VAT
+
+
+
+ Type
+ Cat5
+
+
+
+ 0.75
+ 1
+
+
+
\ No newline at end of file
diff --git a/oxalis-dist/oxalis-standalone/src/test/resources/BII04_T10_PEPPOL-v2.0_invoice.xml b/oxalis-dist/oxalis-standalone/src/test/resources/BII04_T10_PEPPOL-v2.0_invoice.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9d9f46478339ab8ebe75bf33def7d33df00249a1
--- /dev/null
+++ b/oxalis-dist/oxalis-standalone/src/test/resources/BII04_T10_PEPPOL-v2.0_invoice.xml
@@ -0,0 +1,497 @@
+
+
+
+
+ 2.1
+
+ urn:www.cenbii.eu:transaction:biitrns010:ver2.0:extended:urn:www.peppol.eu:bis:peppol4a:ver2.0
+
+ urn:www.cenbii.eu:profile:bii04:ver2.0
+ TOSL108
+ 2009-12-15
+ 380
+ Ordered in our booth at the convention.
+ 2009-11-30
+ EUR
+ Project cost code 123
+
+ 2009-11-01
+ 2009-11-30
+
+
+ 123
+
+
+ Contract321
+ Framework agreement
+
+
+ Doc1
+ Timesheet
+
+
+ http://www.suppliersite.eu/sheet001.html
+
+
+
+
+ Doc2
+ Drawing
+
+ JVBERi0xLjQNCiW1tbW1DQoxIDAgb2JqDQo8PC9UeXBlL0NhdGFsb2cvUGFnZXMgMiAwIFIvTGFuZyhuYi1OTykgL091dHB1dEludGVudHNbPDwvVHlwZS9PdXRwdXRJbnRlbnQvUy9HVFNfUERGQTEvT3V0cHV0Q29uZGl0aW9uSWRlbnRpZmllcihzUkdCKSAvUmVnaXN0cnlOYW1lKGh0dHA6Ly93d3cuY29sb3Iub3JnKSAvSW5mbyhDcmVhdG9yOiBIUCAgICAgTWFudWZhY3R1cmVyOklFQyAgICBNb2RlbDpzUkdCKSAvRGVzdE91dHB1dFByb2ZpbGUgMTEgMCBSPj5dIC9NZXRhZGF0YSAxMiAwIFI+Pg0KZW5kb2JqDQoyIDAgb2JqDQo8PC9UeXBlL1BhZ2VzL0NvdW50IDEvS2lkc1sgMyAwIFJdID4+DQplbmRvYmoNCjMgMCBvYmoNCjw8L1R5cGUvUGFnZS9QYXJlbnQgMiAwIFIvUmVzb3VyY2VzPDwvRm9udDw8L0YxIDUgMCBSPj4vUHJvY1NldFsvUERGL1RleHQvSW1hZ2VCL0ltYWdlQy9JbWFnZUldID4+L01lZGlhQm94WyAwIDAgNTk1LjMyIDg0MS45Ml0gL0NvbnRlbnRzIDQgMCBSPj4NCmVuZG9iag0KNCAwIG9iag0KPDwvRmlsdGVyL0ZsYXRlRGVjb2RlL0xlbmd0aCAxMjA+Pg0Kc3RyZWFtDQp4nHMK4eXSdzNUMDTUMzBRCEnj5TJUMABCQwVzAz0LIxMFczMDPTMLhZBcXi4DhXQQ4c7LFa3hqBCgqWus4aKpa6LhpmlorKGQkg9iJ5eCOLkgZmpeiZ5mrEKIFy+XK9AWpxCE2YYmFnpGRshmR2soIKkFAJQwHV8NCmVuZHN0cmVhbQ0KZW5kb2JqDQo1IDAgb2JqDQo8PC9UeXBlL0ZvbnQvU3VidHlwZS9UcnVlVHlwZS9OYW1lL0YxL0Jhc2VGb250L0FCQ0RFRStDYWxpYnJpL0VuY29kaW5nL1dpbkFuc2lFbmNvZGluZy9Gb250RGVzY3JpcHRvciA2IDAgUi9GaXJzdENoYXIgMzIvTGFzdENoYXIgMTE3L1dpZHRocyA4IDAgUj4+DQplbmRvYmoNCjYgMCBvYmoNCjw8L1R5cGUvRm9udERlc2Ny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OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IjMuMS03MDEiPgo8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgo8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIj4KPC9yZGY6RGVzY3JpcHRpb24+CjxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiICB4bWxuczp4bXBSaWdodHM9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9yaWdodHMvIj4KPHhtcFJpZ2h0czpNYXJrZWQ+VHJ1ZTwveG1wUmlnaHRzOk1hcmtlZD48L3JkZjpEZXNjcmlwdGlvbj4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAo8L3JkZjpSREY+PC94OnhtcG1ldGE+PD94cGFja2V0IGVuZD0idyI/Pg0KZW5kc3RyZWFtDQplbmRvYmoNCjExIDAgb2JqDQo8PC9OIDMvRmlsdGVyL0ZsYXRlRGVjb2RlL0xlbmd0aCAyNTkzPj4NCnN0cmVhbQ0KeJydlndUVNcWh8+9d3qhzTB0GHqvUgYQ6R2kV1EYZgYYygDDDNgLIioQUUSkKYIEBQwYDUViRRQLAVEBe0CCgBKDUWyoZEbWSnx5ee/l5ffHPd/aZ+9z99l737UuACQvPy4vHZYCII0n4Ad7utAjo6Lp2H4AAzzAAHMAmKysDP8Qj1Agkre7Kz1L5AT+Ra+HASRebxl7BdLp4P+TNCuDLwAAChTxEjYniyXiPBGn5ggyxPZZEVPjU8QMo8TMFyUoYnkxJy6y0WefRXYSMzuNxxaxOOcMdhpbzD0i3pEt5IgY8RNxfjaXkyPi2yLWShWmcUX8VhybxmFmAYAiie0CDitJxGYiJvFDg11FvBQAHCnxC47/ggWc1QLxpVzTM9bwuYlJAroeS59ubmvLoHtxclI5AoFxIJOV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OmFib3V0PSIiICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iPgo8ZGM6Y3JlYXRvcj48cmRmOlNlcT48cmRmOmxpPnRlcmplaW88L3JkZjpsaT48L3JkZjpTZXE+PC9kYzpjcmVhdG9yPjwvcmRmOkRlc2NyaXB0aW9uPgo8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIj4KPHhtcDpDcmVhdG9yVG9vbD5NaWNyb3NvZnTCriBXb3JkIDIwMTA8L3htcDpDcmVhdG9yVG9vbD48eG1wOkNyZWF0ZURhdGU+MjAxMS0wNC0wNlQxOToyOTo0NCswMjowMDwveG1wOkNyZWF0ZURhdGU+PHhtcDpNb2RpZnlEYXRlPjIwMTEtMDQtMDZUMTk6Mjk6NDQrMDI6MDA8L3htcDpNb2RpZnlEYXRlPjwvcmRmOkRlc2NyaXB0aW9uPgo8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiAgeG1sbnM6eGFwTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iPgo8eGFwTU06RG9jdW1lbnRJRD40MjY3QUQyNy1GNDY2LTQ2NzMtOTJEMy1BOTM3RDRCODZFNEU8L3hhcE1NOkRvY3VtZW50SUQ+PHhhcE1NOkluc3RhbmNlSUQ+NDI2N0FEMjctRjQ2Ni00NjczLTkyRDMtQTkzN0Q0Qjg2RTRFPC94YXBNTTpJbnN0YW5jZUlEPjwvcmRmOkRlc2NyaXB0aW9uPgo8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiAgeG1sbnM6cGRmYWlkPSJodHRwOi8vd3d3LmFpaW0ub3JnL3BkZmEvbnMvaWQvIj4KPHBkZmFpZDpwYXJ0PjE8L3BkZmFpZDpwYXJ0PjxwZGZhaWQ6Y29uZm9ybWFuY2U+QjwvcGRmYWlkOmNvbmZvcm1hbmNlPjwvcmRmOkRlc2NyaXB0aW9uPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKPC9yZGY6UkRGPjwveDp4bXBtZXRhPjw/eHBhY2tldCBlbmQ9InciPz4NCmVuZHN0cmVhbQ0KZW5kb2JqDQp4cmVmDQowIDEzDQowMDAwMDAwMDAwIDY1NTM1IGYNCjAwMDAwMDAwMTcgMDAwMDAgbg0KMDAwMDAwMDI5MyAwMDAwMCBuDQowMDAwMDAwMzQ5IDAwMDAwIG4NCjAwMDAwMDA1MTMgMDAwMDAgbg0KMDAwMDAwMDcwNyAwMDAwMCBuDQowMDAwMDAwODc0IDAwMDAwIG4NCjAwMDAwMDExMTIgMDAwMDAgbg0KMDAwMDAwMTMzMiAwMDAwMCBuDQowMDAwMDAxNTU0IDAwMDAwIG4NCjAwMDAwODE3ODMgMDAwMDAgbg0KMDAwMDA4MzMyOSAwMDAwMCBuDQowMDAwMDg2MDAyIDAwMDAwIG4NCnRyYWlsZXINCjw8L1NpemUgMTMvUm9vdCAxIDAgUi9JbmZvIDcgMCBSL0lEWzwyN0FENjc0MjY2RjQ3MzQ2OTJEM0E5MzdENEI4NkU0RT48MjdBRDY3NDI2NkY0NzM0NjkyRDNBOTM3RDRCODZFNEU+XSA+Pg0Kc3RhcnR4cmVmDQo4OTMwMA0KJSVFT0Y=
+
+
+
+
+ 1234567890123
+
+ Supp123
+
+
+ Salescompany ltd.
+
+
+ 1231412341324
+ 5467
+ Main street
+ Suite 123
+ 1
+ Revenue department
+ Big city
+ 54321
+ RegionA
+
+ NO
+
+
+
+ NO999999999MVA
+
+ VAT
+
+
+
+ The Sellercompany Incorporated
+ 810418052
+
+ Big city
+ RegionA
+
+ DK
+
+
+
+
+ O. Hansen
+ 46211230
+ 46211231
+ antonio@salescompany.dk
+
+
+ Antonio
+ Salemacher
+ M
+ Sales manager
+
+
+
+
+
+ 1234567987654
+
+ 345KS5324
+
+
+ Buyercompany ltd
+
+
+ 1238764941386
+ 123
+ Anystreet
+ Back door
+ 8
+ Accounting department
+ Anytown
+ 101
+ RegionB
+
+ BE
+
+
+
+ BE54321
+
+ VAT
+
+
+
+ The buyercompany inc.
+ 810418052
+
+ Mainplace
+ RegionB
+
+ BE
+
+
+
+
+ 3150bdn
+ 5121230
+ 5121231
+ john@buyercompany.eu
+
+
+ John
+ Doe
+ X
+ Purchasing manager
+
+
+
+
+
+ 098740918237
+
+
+ Ebeneser Scrooge Inc.
+
+
+ 6411982340
+
+
+
+ 2009-12-15
+
+ 6754238987648
+
+ Deliverystreet
+ Side door
+ 12
+ DeliveryCity
+ 523427
+ RegionC
+
+ BE
+
+
+
+
+
+ 31
+ 2009-12-31
+ SW
+ Payref1
+
+ NO9386011117947
+
+ 9710
+
+ DNBANOKK
+
+
+
+
+
+ Penalty percentage 10% from due date
+
+
+ true
+ Packing cost
+ 100
+
+ S
+ 25
+
+ VAT
+
+
+
+
+ false
+ Promotion discount
+ 100
+
+ S
+ 25
+
+ VAT
+
+
+
+
+ 292.20
+
+ 1460.5
+ 292.1
+
+ S
+ 25
+
+ VAT
+
+
+
+
+ 1
+ 0.1
+
+ AA
+ 10
+
+ VAT
+
+
+
+
+ -25
+ 0
+
+ E
+ 0
+ AAM
+ Exempt New Means of Transport
+
+ VAT
+
+
+
+
+
+ 1436.5
+ 1436.5
+ 1729
+ 100
+ 100
+ 1000
+ 0.30
+ 729
+
+
+ 1
+ Scratch on box
+ 1
+ 1273
+ BookingCode001
+
+ 1
+
+
+ false
+ Damage
+ 12
+
+
+ true
+ Testing
+ 12
+
+
+ 254.6
+
+
+ Processor: Intel Core 2 Duo SU9400 LV (1.4GHz). RAM: 3MB. Screen 1440x900
+ Laptop computer
+
+ JB007
+
+
+ 1234567890124
+
+
+ 12344321
+
+
+ 65434568
+
+
+ S
+ 25
+
+ VAT
+
+
+
+ Color
+ Black
+
+
+
+ 1273
+ 1
+
+ false
+ Contract
+ 0.15
+ 225
+ 1500
+
+
+
+
+ 2
+ Cover is slightly damaged.
+ -1
+ -3.96
+ BookingCode002
+
+ 5
+
+
+ -0.396
+
+
+ Returned "Advanced computing" book
+
+ JB008
+
+
+ 1234567890125
+
+
+ 32344324
+
+
+ 65434567
+
+
+ AA
+ 10
+
+ VAT
+
+
+
+
+ 3.96
+ 1
+
+
+
+ 3
+ 2
+ 4.96
+ BookingCode003
+
+ 3
+
+
+ 0.496
+
+
+ "Computing for dummies" book
+
+ JB009
+
+
+ 1234567890126
+
+
+ 32344324
+
+
+ 65434566
+
+
+ AA
+ 10
+
+ VAT
+
+
+
+
+ 2.48
+ 1
+
+ false
+ Contract
+ 0.1
+ 0.275
+ 2.75
+
+
+
+
+ 4
+ -1
+ -25
+ BookingCode004
+
+ 2
+
+
+ 0
+
+
+ Returned IBM 5150 desktop
+
+ JB010
+
+
+ 1234567890127
+
+
+ 12344322
+
+
+ 65434565
+
+
+ E
+ 0
+
+ VAT
+
+
+
+
+ 25
+ 1
+
+
+
+ 5
+ 250
+ 187.5
+ BookingCode005
+
+ 4
+
+
+ 37.5
+
+
+ Network cable
+
+ JB011
+
+
+ 1234567890128
+
+
+ 12344325
+
+
+ 65434564
+
+
+ S
+ 25
+
+ VAT
+
+
+
+ Type
+ Cat5
+
+
+
+ 0.75
+ 1
+
+
+
\ No newline at end of file
diff --git a/oxalis-dist/oxalis-standalone/src/test/resources/sbdh-asic.xml b/oxalis-dist/oxalis-standalone/src/test/resources/sbdh-asic.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2cc1bef31544daccc97bc7cdc1e857f6ba53a4ca
--- /dev/null
+++ b/oxalis-dist/oxalis-standalone/src/test/resources/sbdh-asic.xml
@@ -0,0 +1,154 @@
+
+
+
+ 1.0
+
+ 9908:810018909
+
+
+ 9908:810418052
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Tender-2
+ 2.1
+ FA4A6819-6149-4134-95C3-C53A65338EB6
+ Tender
+ 2015-07-26T20:08:00+01:00
+
+
+ 1
+
+ application/vnd.etsi.asic-e+zip
+ #asic
+ ASiC archive containing the business documents.
+
+
+
+
+ PROCESSID
+ urn:www.cenbii.eu:profile:bii46:ver3.0
+
+
+ DOCUMENTID
+
+ urn:oasis:names:specification:ubl:schema:xsd:Tender-2::Tender##urn:www.cenbii.eu:transaction:biitrdm090:ver3.0::2.1
+
+
+
+
+
+ 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
+ QS1JTkYvbWFuaWZlc3QueG1srZHBasMwDIbveQrj63CS3jaTtLc9wfYAaqyuBls2llKSPf2clMFg
+ MHqYbhK/vv8XGk5LDOqGhX2iUR/aXiukKTlPH6N+f3s1z1qxADkIiXDUK7I+HZuB+GAjkL8gi6oM
+ YltHo54L2QTsawsR2cpkU0ZyaZojkti79HvTbobHRtXaiRcf0FRZWdXeziGYDHIddaf3SUTnwcia
+ axTIOfgJpCbvbuRaFPZttZ4MPn36rLuHwHx217am+pu/CR7jSXGxf+kNz+foxUi9HYthiDngf/rc
+ iaYguIitLPIbLLhIlwN42phD9/Nnx+YLUEsHCFuZArnqAAAA+wEAAFBLAQIKAAoAAAgAAI1ZMEeK
+ IflFHwAAAB8AAAAIAAAAKAAAAAAAAAAAAAAAAABtaW1ldHlwZW1pbWV0eXBlPWFwcGxpY2F0aW9u
+ L3ZuZC5ldHNpLmFzaWMtZSt6aXBQSwECFAAUAAgICACNWTBH1R7KSasEAADfCwAACAAAAAAAAAAA
+ AAAAAABFAAAAc2JkaC54bWxQSwECFAAUAAgICACNWTBHqhrKndAGAABLEwAAIAAAAAAAAAAAAAAA
+ AAAmBQAAdHJkbTA5MC1zdWJtaXQtdGVuZGVyLXNhbXBsZS54bWxQSwECFAAUAAgICACNWTBHGHwq
+ qDcAAAA5AAAAEQAAAAAAAAAAAAAAAABEDAAAc2FtcGxlLXJlYWRtZS50eHRQSwECFAAUAAgICACN
+ WTBHjEPERu8BAABwBAAAGQAAAAAAAAAAAAAAAAC6DAAATUVUQS1JTkYvYXNpY21hbmlmZXN0Lnht
+ bFBLAQIUABQACAgIAI1ZMEeS19UY5gUAAGEHAAA7AAAAAAAAAAAAAAAAAPAOAABNRVRBLUlORi9z
+ aWduYXR1cmUtNGFjMjIwYTUtYzVkMi00YmFlLTliZmItODVhNjdhMDY3ZTZjLnA3c1BLAQIUABQA
+ CAgIAI1ZMEdbmQK56gAAAPsBAAAVAAAAAAAAAAAAAAAAAD8VAABNRVRBLUlORi9tYW5pZmVzdC54
+ bWxQSwUGAAAAAAcABwAUAgAAbBYAACgAbWltZXR5cGU9YXBwbGljYXRpb24vdm5kLmV0c2kuYXNp
+ Yy1lK3ppcA==
+
+
+
diff --git a/oxalis-dist/oxalis-war/README.md b/oxalis-dist/oxalis-war/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..91562d3db9afce0db2c194f8c78ad8246bb854e2
--- /dev/null
+++ b/oxalis-dist/oxalis-war/README.md
@@ -0,0 +1,57 @@
+# Oxalis Web Archive (Oxalis WAR)
+
+The traditional war distribution for application servers recreated to use Java Servlet 3.0 functionality.
+This is the distribution made available as `oxalis.war` in `oxalis-distribution`.
+
+It is recommended to create your own web archive (war) if you need to change anything inside the one provided by this project.
+The following is a Maven configuration file (`pom.xml`) for your own project where you may customize Oxalis to your needs without having to change any existing artifacts.
+This allow for the convenient deployment of a single web archive including your own code.
+
+```xml
+
+
+ 4.0.0
+
+
+ com.example.peppol
+ oxalis
+ 1.0-SNAPSHOT
+
+
+ war
+
+
+
+ 4.0.x
+
+
+
+
+ network.oxalis
+ oxalis-war
+ ${oxalis.version}
+ classes
+
+
+
+
+
+
+ oxalis
+
+
+ org.apache.maven.plugins
+ maven-war-plugin
+ 3.3.2
+
+
+ false
+
+
+
+
+
+
+```
diff --git a/oxalis-dist/oxalis-war/pom.xml b/oxalis-dist/oxalis-war/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ef20f1943b9552165687cf3733f36f1aa1d8dcc9
--- /dev/null
+++ b/oxalis-dist/oxalis-war/pom.xml
@@ -0,0 +1,66 @@
+
+
+
+ oxalis
+ dk.erst.oxalis
+ 0.9.0-e2f4121ccb55b5a60e6edebf7b28d277741d6789
+ ../../pom.xml
+
+ 4.0.0
+
+ oxalis-war
+ war
+
+ Oxalis :: Dist :: WAR
+ Oxalis WAR for deployment on application servers or as library for your own project.
+ https://rep.erst.dk/git/openebusiness/nemhandeledelivery/oxalis
+
+
+ Erhvervsstyrelsen
+ https://nemhandel.dk/
+
+
+
+
+
+ dk.erst.oxalis
+ oxalis-inbound
+
+
+
+
+ javax.servlet
+ javax.servlet-api
+ provided
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-war-plugin
+ 3.3.2
+
+ false
+
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+
+
+ package
+
+ jar
+
+
+ classes
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/oxalis-dist/oxalis-war/src/main/java/network/oxalis/dist/war/WarGuiceFilter.java b/oxalis-dist/oxalis-war/src/main/java/network/oxalis/dist/war/WarGuiceFilter.java
new file mode 100644
index 0000000000000000000000000000000000000000..7ae725ca229cf79af27a474c8d527e20ec060dd0
--- /dev/null
+++ b/oxalis-dist/oxalis-war/src/main/java/network/oxalis/dist/war/WarGuiceFilter.java
@@ -0,0 +1,23 @@
+package network.oxalis.dist.war;
+
+import com.google.inject.servlet.GuiceFilter;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.annotation.WebFilter;
+import java.io.IOException;
+
+/**
+ * @author erlend
+ */
+@WebFilter("/*")
+public class WarGuiceFilter extends GuiceFilter {
+
+ @Override
+ public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
+ throws IOException, ServletException {
+ super.doFilter(servletRequest, servletResponse, filterChain);
+ }
+}
diff --git a/oxalis-dist/oxalis-war/src/main/java/network/oxalis/dist/war/WarServletContextListener.java b/oxalis-dist/oxalis-war/src/main/java/network/oxalis/dist/war/WarServletContextListener.java
new file mode 100644
index 0000000000000000000000000000000000000000..c8a49b4877cca16233b5ce8c400a39ca33fa8b5e
--- /dev/null
+++ b/oxalis-dist/oxalis-war/src/main/java/network/oxalis/dist/war/WarServletContextListener.java
@@ -0,0 +1,13 @@
+package network.oxalis.dist.war;
+
+import network.oxalis.inbound.OxalisGuiceContextListener;
+
+import javax.servlet.annotation.WebListener;
+
+/**
+ * @author erlend
+ */
+@WebListener
+public class WarServletContextListener extends OxalisGuiceContextListener {
+
+}
diff --git a/oxalis-extension/oxalis-as2/pom.xml b/oxalis-extension/oxalis-as2/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5da1b108dc62893d6aa28a5e1f6d0ebafb8d1bd2
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/pom.xml
@@ -0,0 +1,95 @@
+
+
+
+
+ 4.0.0
+
+
+ dk.erst.oxalis
+ oxalis-extension
+ 5.5.0
+
+
+ oxalis-as2
+ jar
+
+ Oxalis :: Ext :: AS2
+ Library holding classes and stuff pertaining to AS2
+ https://rep.erst.dk/git/openebusiness/nemhandeledelivery/oxalis
+
+
+ Erhvervsstyrelsen
+ https://nemhandel.dk/
+
+
+
+
+
+ dk.erst.oxalis
+ oxalis-test
+ test
+
+
+
+ javax.servlet
+ javax.servlet-api
+ provided
+
+
+
+
+ ch.qos.logback
+ logback-classic
+ test
+
+
+
+
+ org.bouncycastle
+ bcmail-jdk15on
+
+
+
+ com.sun.mail
+ jakarta.mail
+
+
+ jakarta.activation
+ jakarta.activation-api
+
+
+
+
+ com.google.inject.extensions
+ guice-servlet
+ provided
+
+
+
+
+ io.opentracing.contrib
+ opentracing-web-servlet-filter
+
+
+
+
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/code/As2Header.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/code/As2Header.java
new file mode 100644
index 0000000000000000000000000000000000000000..512f0532d0bdd777475bbd132caa45239dfe070d
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/code/As2Header.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.code;
+
+/**
+ * Defines the AS2-Specific HTTP Headers according to RFC4130 section 6.
+ *
+ * @author steinar
+ * @author erlend
+ */
+public class As2Header {
+
+ public static final String MESSAGE_ID = "Message-Id";
+
+ public static final String MIME_VERSION = "MIME-Version";
+
+ public static final String CONTENT_TYPE = "Content-Type";
+
+ public static final String AS2_VERSION = "AS2-Version";
+
+ public static final String AS2_FROM = "AS2-From";
+
+ public static final String AS2_TO = "AS2-To";
+
+ public static final String SUBJECT = "Subject";
+
+ public static final String DATE = "Date";
+
+ public static final String DISPOSITION_NOTIFICATION_TO = "Disposition-Notification-To";
+
+ public static final String DISPOSITION_NOTIFICATION_OPTIONS = "Disposition-Notification-Options";
+
+ public static final String RECEIPT_DELIVERY_OPTION = "Receipt-Delivery-Option";
+
+ public static final String SERVER = "Server";
+
+ // PEPPOL Transport Infrastructure AS2 Profile specifies AS2 version 1.0
+ public static final String VERSION = "1.0";
+
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/code/Disposition.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/code/Disposition.java
new file mode 100644
index 0000000000000000000000000000000000000000..2ef4b20098631fd7957fc7bbae87a2923550cc32
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/code/Disposition.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.code;
+
+import com.google.common.collect.ImmutableMap;
+import network.oxalis.api.lang.VerifierException;
+
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author erlend
+ */
+public class Disposition {
+
+ private static final Pattern PATTERN = Pattern.compile("^(.*?); ([a-z]+)/([a-z]+): (.*)|(.*?); ([a-z]+)$");
+
+ private static final String SENT_AUTOMATICALLY = "automatic-action/MDN-sent-automatically";
+
+ public static final Disposition PROCESSED = new Disposition(
+ DispositionType.PROCESSED, null, null);
+
+ public static final Disposition UNSUPPORTED_FORMAT = new Disposition(
+ DispositionType.FAILED, DispositionModifier.FAILURE,
+ DispositionModifierExtension.UNEXPECTED_PROCESSING_ERROR);
+
+ public static final Disposition UNSUPPORTED_MIC_ALGORITHMS = new Disposition(
+ DispositionType.FAILED, DispositionModifier.FAILURE,
+ DispositionModifierExtension.UNSUPPORTED_MIC_ALGORITHMS);
+
+ public static final Disposition SENDER_EQUALS_RECEIVER = new Disposition(
+ DispositionType.FAILED, DispositionModifier.FAILURE,
+ DispositionModifierExtension.SENDER_EQUALS_RECEIVER);
+
+ public static final Disposition DECRYPTION_FAILED = new Disposition(
+ DispositionType.FAILED, DispositionModifier.ERROR,
+ DispositionModifierExtension.DECRYPTION_FAILED);
+
+ public static final Disposition AUTHENTICATION_FAILED = new Disposition(
+ DispositionType.FAILED, DispositionModifier.ERROR,
+ DispositionModifierExtension.AUTHENTICATION_FAILED);
+
+ public static final Disposition INTEGRITY_CHECK_FAILED = new Disposition(
+ DispositionType.FAILED, DispositionModifier.ERROR,
+ DispositionModifierExtension.INTEGRITY_CHECK_FAILED);
+
+ public static final Disposition PARTICIPANT_NOT_ACCEPTED = new Disposition(
+ DispositionType.FAILED, DispositionModifier.ERROR,
+ DispositionModifierExtension.PARTICIPANT_NOT_ACCEPTED);
+
+ public static final Disposition DOCUMENT_TYPE_ID_NOT_ACCEPTED = new Disposition(
+ DispositionType.FAILED, DispositionModifier.ERROR,
+ DispositionModifierExtension.DOCUMENT_TYPE_ID_NOT_ACCEPTED);
+
+ public static final Disposition PROCESS_ID_NOT_ACCEPTED = new Disposition(
+ DispositionType.FAILED, DispositionModifier.ERROR,
+ DispositionModifierExtension.PROCESS_ID_NOT_ACCEPTED);
+
+ public static final Disposition UNEXPECTED_PROCESSING_ERROR = new Disposition(
+ DispositionType.FAILED, DispositionModifier.ERROR,
+ DispositionModifierExtension.UNEXPECTED_PROCESSING_ERROR);
+
+ public static final Disposition DUPLICATE_DOCUMENT = new Disposition(
+ DispositionType.PROCESSED, DispositionModifier.WARNING,
+ DispositionModifierExtension.DUPLICATE_DOCUMENT);
+
+ private static Map verifierMap =
+ ImmutableMap.builder()
+ .put(VerifierException.Reason.DOCUMENT_TYPE, DOCUMENT_TYPE_ID_NOT_ACCEPTED)
+ .put(VerifierException.Reason.PROCESS, PROCESS_ID_NOT_ACCEPTED)
+ .put(VerifierException.Reason.PARTICIPANT, PARTICIPANT_NOT_ACCEPTED)
+ .build();
+
+ private DispositionType type;
+
+ private DispositionModifier modifier;
+
+ private DispositionModifierExtension extension;
+
+ public static Disposition parse(String str) {
+ // Matcher matcher = PATTERN.matcher(str);
+ String cleaned = str.replaceAll("[ \r\n\t]+", " ");
+
+ Matcher matcher = PATTERN.matcher(cleaned);
+
+ if (matcher.matches()) {
+ if (matcher.group(1) == null)
+ return new Disposition(
+ DispositionType.of(matcher.group(6)),
+ null, null
+ );
+ else
+ return new Disposition(
+ DispositionType.of(matcher.group(2)),
+ DispositionModifier.of(matcher.group(3)),
+ DispositionModifierExtension.of(matcher.group(4))
+ );
+ }
+
+ throw new IllegalStateException(String.format("Unable to parseOld disposition '%s'.", str));
+ }
+
+ public static Disposition fromVerifierException(VerifierException e) {
+ return verifierMap.get(e.getReason());
+ }
+
+ private Disposition(DispositionType type, DispositionModifier modifier, DispositionModifierExtension extension) {
+ this.type = type;
+ this.modifier = modifier;
+ this.extension = extension;
+ }
+
+ public DispositionType getType() {
+ return type;
+ }
+
+ public DispositionModifier getModifier() {
+ return modifier;
+ }
+
+ public DispositionModifierExtension getExtension() {
+ return extension;
+ }
+
+ @Override
+ public String toString() {
+ if (modifier == null)
+ return String.format("%s; %s", SENT_AUTOMATICALLY, type);
+ else
+ return String.format("%s; %s/%s: %s", SENT_AUTOMATICALLY, type, modifier, extension);
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/code/DispositionModifier.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/code/DispositionModifier.java
new file mode 100644
index 0000000000000000000000000000000000000000..9e954447a8acf71707a24f3f66e4c5fd34f03832
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/code/DispositionModifier.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.code;
+
+/**
+ * @author erlend
+ */
+public enum DispositionModifier {
+
+ FAILURE("failure"),
+
+ ERROR("error"),
+
+ WARNING("warning");
+
+ private String code;
+
+ public static DispositionModifier of(String str) {
+ for (DispositionModifier modifier : values())
+ if (modifier.code.equals(str))
+ return modifier;
+
+ throw new IllegalArgumentException(String.format("Unknown disposition modifier: %s", str));
+ }
+
+ DispositionModifier(String code) {
+ this.code = code;
+ }
+
+ @Override
+ public String toString() {
+ return code;
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/code/DispositionModifierExtension.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/code/DispositionModifierExtension.java
new file mode 100644
index 0000000000000000000000000000000000000000..78fb4788405f0b2323bf42ae57f6220236aad98e
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/code/DispositionModifierExtension.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.code;
+
+/**
+ * @author erlend
+ */
+public enum DispositionModifierExtension {
+
+ UNSUPPORTED_FORMAT("unsupported format"),
+
+ UNSUPPORTED_MIC_ALGORITHMS("unsupported MIC-algorithms"),
+
+ SENDER_EQUALS_RECEIVER("sender-equals-receiver"),
+
+ DECRYPTION_FAILED("decryption-failed"),
+
+ AUTHENTICATION_FAILED("authentication-failed"),
+
+ INTEGRITY_CHECK_FAILED("integrity-check-failed"),
+
+ PARTICIPANT_NOT_ACCEPTED("participant-not-accepted"),
+
+ DOCUMENT_TYPE_ID_NOT_ACCEPTED("document-modifier-id-not-accepted"),
+
+ PROCESS_ID_NOT_ACCEPTED("process-id-not-accepted"),
+
+ UNEXPECTED_PROCESSING_ERROR("unexpected-processing-error"),
+
+ DUPLICATE_DOCUMENT("duplicate-document");
+
+ private final String value;
+
+ public static DispositionModifierExtension of(String str) {
+ for (DispositionModifierExtension extension : values())
+ if (extension.value.equals(str))
+ return extension;
+
+ throw new IllegalArgumentException(String.format("Unknown disposition modifier extension: %s", str));
+ }
+
+ DispositionModifierExtension(String extension) {
+ this.value = extension;
+ }
+
+ @Override
+ public String toString() {
+ return value;
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/code/DispositionType.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/code/DispositionType.java
new file mode 100644
index 0000000000000000000000000000000000000000..16a5e220b5c29b3fea235f3673921c35bc1bb22e
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/code/DispositionType.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.code;
+
+/**
+ * @author erlend
+ */
+public enum DispositionType {
+
+ PROCESSED("processed"),
+
+ FAILED("failed");
+
+ private String code;
+
+ public static DispositionType of(String str) {
+ for (DispositionType modifier : values())
+ if (modifier.code.equals(str))
+ return modifier;
+
+ throw new IllegalArgumentException(String.format("Unknown disposition type: %s", str));
+ }
+
+ DispositionType(String code) {
+ this.code = code;
+ }
+
+ @Override
+ public String toString() {
+ return code;
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/code/MdnHeader.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/code/MdnHeader.java
new file mode 100644
index 0000000000000000000000000000000000000000..64d1250e3b954fec0b8fc513cb408dad755269a0
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/code/MdnHeader.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.code;
+
+public class MdnHeader {
+
+ public static final String REPORTING_UA = "Reporting-UA";
+
+ public static final String ORIGINAL_RECIPIENT = "Original-Recipient";
+
+ public static final String FINAL_RECIPIENT = "Final-Recipient";
+
+ public static final String ORIGINAL_MESSAGE_ID = "Original-Message-ID";
+
+ public static final String DISPOSITION = "Disposition";
+
+ public static final String RECEIVED_CONTENT_MIC = "Received-Content-Mic";
+
+ public static final String DATE = "Date";
+
+ public static final String ORIGINAL_CONTENT_HEADER = "X-Oxalis-Original-Content-Header";
+
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/common/As2CommonModule.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/common/As2CommonModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..c7331595ae378356661ea7910e4948c261892805
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/common/As2CommonModule.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2010-2017 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.common;
+
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import com.google.inject.name.Named;
+import network.oxalis.api.settings.Settings;
+import network.oxalis.commons.guice.OxalisModule;
+
+/**
+ * @author erlend
+ * @since 4.0.2
+ */
+public class As2CommonModule extends OxalisModule {
+
+ @Override
+ protected void configure() {
+ bindSettings(As2Conf.class);
+ }
+
+ @Provides
+ @Singleton
+ @Named("as2-notification")
+ public String getNotification(Settings settings) {
+ return settings.getString(As2Conf.NOTIFICATION);
+ }
+
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/common/As2Conf.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/common/As2Conf.java
new file mode 100644
index 0000000000000000000000000000000000000000..7c21f42843e302699497cd553687960149040553
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/common/As2Conf.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2010-2017 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.common;
+
+import network.oxalis.api.settings.DefaultValue;
+import network.oxalis.api.settings.Path;
+import network.oxalis.api.settings.Title;
+
+/**
+ * @author erlend
+ * @since 4.0.2
+ */
+@Title("AS2")
+public enum As2Conf {
+
+ @Path("oxalis.as2.notification")
+ @DefaultValue("not.in.use@difi.no")
+ NOTIFICATION,
+
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/inbound/As2InboundHandler.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/inbound/As2InboundHandler.java
new file mode 100644
index 0000000000000000000000000000000000000000..321e70ba94d978dcda0a8c44f42997b3b7e14c1b
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/inbound/As2InboundHandler.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.inbound;
+
+import com.google.inject.Inject;
+import io.opentracing.Span;
+import network.oxalis.api.header.HeaderParser;
+import network.oxalis.api.identifier.MessageIdGenerator;
+import network.oxalis.api.inbound.InboundService;
+import network.oxalis.api.lang.OxalisContentException;
+import network.oxalis.api.lang.OxalisSecurityException;
+import network.oxalis.api.lang.VerifierException;
+import network.oxalis.api.model.Direction;
+import network.oxalis.api.model.TransmissionIdentifier;
+import network.oxalis.api.persist.PersisterHandler;
+import network.oxalis.api.tag.Tag;
+import network.oxalis.api.tag.TagGenerator;
+import network.oxalis.api.timestamp.Timestamp;
+import network.oxalis.api.timestamp.TimestampProvider;
+import network.oxalis.api.transmission.TransmissionVerifier;
+import network.oxalis.as2.code.As2Header;
+import network.oxalis.as2.code.Disposition;
+import network.oxalis.as2.code.MdnHeader;
+import network.oxalis.as2.lang.OxalisAs2InboundException;
+import network.oxalis.as2.model.Mic;
+import network.oxalis.as2.util.*;
+import network.oxalis.commons.mode.OxalisCertificateValidator;
+import network.oxalis.vefa.peppol.common.code.Service;
+import network.oxalis.vefa.peppol.common.model.Digest;
+import network.oxalis.vefa.peppol.common.model.Header;
+import network.oxalis.vefa.peppol.security.lang.PeppolSecurityException;
+
+import javax.mail.internet.InternetHeaders;
+import javax.mail.internet.MimeMessage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * Main entry point for receiving AS2 messages.
+ *
+ * @author steinar
+ * @author thore
+ * @author erlend
+ */
+class As2InboundHandler {
+
+ private final InboundService inboundService;
+
+ private final TimestampProvider timestampProvider;
+
+ private final PersisterHandler persisterHandler;
+
+ private final TransmissionVerifier transmissionVerifier;
+
+ private final OxalisCertificateValidator certificateValidator;
+
+ private final SMimeMessageFactory sMimeMessageFactory;
+
+ private final TagGenerator tagGenerator;
+
+ private final MessageIdGenerator messageIdGenerator;
+
+ private final HeaderParser headerParser;
+
+ @Inject
+ public As2InboundHandler(InboundService inboundService, TimestampProvider timestampProvider,
+ OxalisCertificateValidator certificateValidator, PersisterHandler persisterHandler,
+ TransmissionVerifier transmissionVerifier, SMimeMessageFactory sMimeMessageFactory,
+ TagGenerator tagGenerator, MessageIdGenerator messageIdGenerator,
+ HeaderParser headerParser) {
+ this.inboundService = inboundService;
+ this.timestampProvider = timestampProvider;
+ this.certificateValidator = certificateValidator;
+
+ this.persisterHandler = persisterHandler;
+ this.transmissionVerifier = transmissionVerifier;
+
+ this.sMimeMessageFactory = sMimeMessageFactory;
+
+ this.tagGenerator = tagGenerator;
+ this.messageIdGenerator = messageIdGenerator;
+ this.headerParser = headerParser;
+ }
+
+ /**
+ * Receives an AS2 Message in the form of a map of headers together with the payload,
+ * which is made available in an input stream
+ *
+ * If persisting message to the Message Repository fails, we have to return negative MDN.
+ *
+ * @param httpHeaders the http headers received
+ * @param mimeMessage supplies the MIME message
+ * @return MDN object to signal if everything is ok or if some error occurred while receiving
+ */
+ public MimeMessage receive(InternetHeaders httpHeaders, MimeMessage mimeMessage, Span root) throws OxalisAs2InboundException {
+ TransmissionIdentifier transmissionIdentifier = null;
+ Header header = null;
+ Path payloadPath = null;
+ OxalisAs2InboundException exception;
+
+ try {
+ SignedMessage message = SignedMessage.load(mimeMessage);
+
+ // Validate content
+ message.validate(Service.AP, certificateValidator,
+ httpHeaders.getHeader(As2Header.AS2_FROM)[0].replace("\"", ""));
+
+ // Get timestamp using signature as input
+ Timestamp t2 = timestampProvider.generate(message.getSignature(), Direction.IN);
+
+ Tag tag = tagGenerator.generate(Direction.IN);
+
+ // Initiate MDN
+ MdnBuilder mdnBuilder = MdnBuilder.newInstance(mimeMessage);
+ mdnBuilder.addHeader(MdnHeader.DATE, t2.getDate());
+
+ // Extract Message-ID
+ transmissionIdentifier = TransmissionIdentifier.fromHeader(httpHeaders.getHeader(As2Header.MESSAGE_ID)[0]);
+ mdnBuilder.addHeader(MdnHeader.ORIGINAL_MESSAGE_ID, httpHeaders.getHeader(As2Header.MESSAGE_ID)[0]);
+
+ // Extract digest algorithm
+ SMimeDigestMethod digestMethod = SMimeDigestMethod.findByIdentifier(message.getMicalg());
+
+ // Extract content headers
+ byte[] headerBytes = message.getBodyHeader();
+ mdnBuilder.addHeader(MdnHeader.ORIGINAL_CONTENT_HEADER, headerBytes);
+
+ byte[] content = message.getContentBytes();
+
+ // Extract header
+ header = headerParser.parse(new ByteArrayInputStream(content));
+
+ // Perform validation of header
+ transmissionVerifier.verify(header, Direction.IN);
+
+ // Create "fresh" InputStream
+ try (InputStream payloadInputStream = new ByteArrayInputStream(content)) {
+ // Persist content
+ payloadPath = persisterHandler.persist(transmissionIdentifier, header, payloadInputStream);
+ }
+
+ // Fetch calculated digest
+ Digest calculatedDigest = Digest.of(digestMethod.getDigestMethod(), message.getDigest());
+ mdnBuilder.addHeader(MdnHeader.RECEIVED_CONTENT_MIC, new Mic(calculatedDigest));
+
+ // Generate Message-Id
+ String messageId = messageIdGenerator.generate(new As2InboundMetadata(transmissionIdentifier, header, t2,
+ null, null, message.getSigner(), null, tag));
+
+ if (!MessageIdUtil.verify(messageId))
+ throw new OxalisAs2InboundException(
+ "Invalid Message-ID '" + messageId + "' generated.",
+ Disposition.UNEXPECTED_PROCESSING_ERROR);
+
+ // Create receipt (MDN)
+ mdnBuilder.addHeader(MdnHeader.DISPOSITION, Disposition.PROCESSED);
+ MimeMessage mdn = sMimeMessageFactory.createSignedMimeMessage(mdnBuilder.build(), digestMethod);
+ // MimeMessage mdn = sMimeMessageFactory.createSignedMimeMessageNew(mdnBuilder.build(), calculatedDigest, digestMethod);
+ mdn.setHeader(As2Header.MESSAGE_ID, messageId);
+ mdn.setHeader(As2Header.AS2_VERSION, As2Header.VERSION);
+ mdn.setHeader(As2Header.AS2_FROM, httpHeaders.getHeader(As2Header.AS2_TO)[0]);
+ mdn.setHeader(As2Header.AS2_TO, httpHeaders.getHeader(As2Header.AS2_FROM)[0]);
+
+ // Prepare MDN
+ ByteArrayOutputStream mdnOutputStream = new ByteArrayOutputStream();
+ mdn.writeTo(mdnOutputStream);
+
+ // Persist metadata
+ As2InboundMetadata inboundMetadata = new As2InboundMetadata(transmissionIdentifier, header, t2,
+ digestMethod.getTransportProfile(), calculatedDigest, message.getSigner(), mdnOutputStream.toByteArray(), tag);
+ persisterHandler.persist(inboundMetadata, payloadPath);
+
+ // Persist statistics
+ inboundService.complete(inboundMetadata);
+
+ return mdn;
+ } catch (OxalisContentException e) {
+ exception = new OxalisAs2InboundException(Disposition.UNSUPPORTED_FORMAT, e.getMessage(), e);
+ persisterHandler.persist(transmissionIdentifier, header, payloadPath, exception);
+ throw exception;
+ } catch (NoSuchAlgorithmException e) {
+ exception = new OxalisAs2InboundException(Disposition.UNSUPPORTED_MIC_ALGORITHMS, e.getMessage(), e);
+ persisterHandler.persist(transmissionIdentifier, header, payloadPath, exception);
+ throw exception;
+ } catch (VerifierException e) {
+ exception = new OxalisAs2InboundException(Disposition.fromVerifierException(e), e.getMessage(), e);
+ persisterHandler.persist(transmissionIdentifier, header, payloadPath, exception);
+ throw exception;
+ } catch (PeppolSecurityException e) {
+ exception = new OxalisAs2InboundException(Disposition.AUTHENTICATION_FAILED, e.getMessage(), e);
+ persisterHandler.persist(transmissionIdentifier, header, payloadPath, exception);
+ throw exception;
+ } catch (OxalisSecurityException e) {
+ exception = new OxalisAs2InboundException(Disposition.INTEGRITY_CHECK_FAILED, e.getMessage(), e);
+ persisterHandler.persist(transmissionIdentifier, header, payloadPath, exception);
+ throw exception;
+ } catch (Exception e) {
+ exception = new OxalisAs2InboundException(Disposition.UNEXPECTED_PROCESSING_ERROR, e.getMessage(), e);
+ persisterHandler.persist(transmissionIdentifier, header, payloadPath, exception);
+ throw exception;
+ }
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/inbound/As2InboundMetadata.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/inbound/As2InboundMetadata.java
new file mode 100644
index 0000000000000000000000000000000000000000..5a376105f62d081787050557003571a9c3a43f92
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/inbound/As2InboundMetadata.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.inbound;
+
+import network.oxalis.api.inbound.InboundMetadata;
+import network.oxalis.api.model.TransmissionIdentifier;
+import network.oxalis.api.tag.Tag;
+import network.oxalis.api.timestamp.Timestamp;
+import network.oxalis.vefa.peppol.common.model.*;
+
+import java.security.cert.X509Certificate;
+import java.util.*;
+
+/**
+ * @author erlend
+ */
+class As2InboundMetadata implements InboundMetadata {
+
+ private final TransmissionIdentifier transmissionIdentifier;
+
+ private final Header header;
+
+ private final Date timestamp;
+
+ private final TransportProfile transportProfile;
+
+ private final Digest digest;
+
+ private final Receipt primaryReceipt;
+
+ private final List receipts;
+
+ private final X509Certificate certificate;
+
+ private final Tag tag;
+
+ public As2InboundMetadata(TransmissionIdentifier transmissionIdentifier, Header header, Timestamp timestamp,
+ TransportProfile transportProfile, Digest digest, X509Certificate certificate,
+ byte[] primaryReceipt, Tag tag) {
+ this.transmissionIdentifier = transmissionIdentifier;
+ this.header = header;
+ this.timestamp = timestamp.getDate();
+ this.transportProfile = transportProfile;
+ this.digest = digest;
+ this.certificate = certificate;
+ this.primaryReceipt = Receipt.of("message/disposition-notification", primaryReceipt);
+ this.tag = tag;
+
+ List receipts = new ArrayList<>();
+ receipts.add(this.primaryReceipt);
+ if (timestamp.getReceipt().isPresent())
+ receipts.add(timestamp.getReceipt().get());
+ this.receipts = Collections.unmodifiableList(receipts);
+ }
+
+ public TransmissionIdentifier getTransmissionIdentifier() {
+ return transmissionIdentifier;
+ }
+
+ @Override
+ public Header getHeader() {
+ return header;
+ }
+
+ @Override
+ public Date getTimestamp() {
+ return timestamp;
+ }
+
+ @Override
+ public TransportProfile getProtocol() {
+ return transportProfile;
+ }
+
+ @Override
+ public TransportProtocol getTransportProtocol() {
+ return TransportProtocol.AS2;
+ }
+
+ @Override
+ public Digest getDigest() {
+ return digest;
+ }
+
+ @Override
+ public List getReceipts() {
+ return receipts;
+ }
+
+ @Override
+ public Receipt primaryReceipt() {
+ return primaryReceipt;
+ }
+
+ @Override
+ public X509Certificate getCertificate() {
+ return certificate;
+ }
+
+ @Override
+ public Tag getTag() {
+ return tag;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ As2InboundMetadata that = (As2InboundMetadata) o;
+ return Objects.equals(transmissionIdentifier, that.transmissionIdentifier) &&
+ Objects.equals(header, that.header) &&
+ Objects.equals(timestamp, that.timestamp) &&
+ Objects.equals(transportProfile, that.transportProfile) &&
+ Objects.equals(digest, that.digest) &&
+ Objects.equals(primaryReceipt, that.primaryReceipt) &&
+ Objects.equals(receipts, that.receipts) &&
+ Objects.equals(certificate, that.certificate) &&
+ Objects.equals(tag, that.tag);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(transmissionIdentifier, header, timestamp, transportProfile,
+ digest, primaryReceipt, receipts, certificate, tag);
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/inbound/As2InboundModule.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/inbound/As2InboundModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..3837395d625fc9924f65fcf5bb876fdc1113df15
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/inbound/As2InboundModule.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.inbound;
+
+import com.google.inject.Key;
+import com.google.inject.name.Names;
+import com.google.inject.servlet.ServletModule;
+
+import javax.servlet.http.HttpServlet;
+
+/**
+ * Guice module providing AS2 implementation for inbound.
+ *
+ * @author erlend
+ * @since 4.0.0
+ */
+public class As2InboundModule extends ServletModule {
+
+ @Override
+ protected void configureServlets() {
+ bind(Key.get(HttpServlet.class, Names.named("oxalis-as2")))
+ .to(As2Servlet.class)
+ .asEagerSingleton();
+
+ serve("/as2*").with(Key.get(HttpServlet.class, Names.named("oxalis-as2")));
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/inbound/As2Servlet.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/inbound/As2Servlet.java
new file mode 100644
index 0000000000000000000000000000000000000000..96ff09b8c4f20638e565fade7050b4cd82c1ece5
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/inbound/As2Servlet.java
@@ -0,0 +1,235 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.inbound;
+
+import com.google.common.io.ByteStreams;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
+import io.opentracing.Span;
+import io.opentracing.SpanContext;
+import io.opentracing.Tracer;
+import io.opentracing.contrib.web.servlet.filter.TracingFilter;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.api.error.ErrorTracker;
+import network.oxalis.api.model.Direction;
+import network.oxalis.as2.code.As2Header;
+import network.oxalis.as2.code.MdnHeader;
+import network.oxalis.as2.lang.OxalisAs2InboundException;
+import network.oxalis.as2.util.*;
+import network.oxalis.commons.security.CertificateUtils;
+import org.slf4j.MDC;
+
+import javax.mail.Header;
+import javax.mail.MessagingException;
+import javax.mail.internet.InternetHeaders;
+import javax.mail.internet.MimeMessage;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.security.cert.X509Certificate;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author steinar
+ * @author thore
+ * @author erlend
+ */
+@Slf4j
+@Singleton
+class As2Servlet extends HttpServlet {
+
+ private final Provider inboundHandlerProvider;
+
+ private final SMimeMessageFactory sMimeMessageFactory;
+
+ private final ErrorTracker errorTracker;
+
+ private final String toIdentifier;
+
+ private final Tracer tracer;
+
+ @Inject
+ public As2Servlet(Provider inboundHandlerProvider, SMimeMessageFactory sMimeMessageFactory,
+ ErrorTracker errorTracker, X509Certificate certificate, Tracer tracer) {
+ this.inboundHandlerProvider = inboundHandlerProvider;
+ this.sMimeMessageFactory = sMimeMessageFactory;
+ this.errorTracker = errorTracker;
+ this.toIdentifier = CertificateUtils.extractCommonName(certificate);
+ this.tracer = tracer;
+ }
+
+ /**
+ * Receives the POST'ed AS2 message.
+ *
+ * Important to note that the HTTP headers contains the MIME headers for the payload.
+ * Since the the request can only be read once, using getReader()/getInputStream()
+ */
+ @Override
+ protected void doPost(final HttpServletRequest request, final HttpServletResponse response)
+ throws IOException {
+
+ // Fail fast when Message-Id header is not provided.
+ if (request.getHeader("message-id") == null) {
+ response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+ response.getWriter().println("Header field 'Message-ID' not found.");
+ return;
+ }
+
+ // Fail fast when AS2-To is not provided or not addressed to me.
+ if (request.getHeader("as2-to") == null) {
+ response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+ response.getWriter().println("Header field 'AS2-To' not found.");
+ return;
+ } else if (!toIdentifier.equals(request.getHeader("as2-to").replace("\"", "").trim())) {
+ response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+ response.getWriter().println("Invalid value in field 'AS2-To'.");
+ return;
+ }
+
+ if (request.getHeader("as2-from") == null) {
+ response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+ response.getWriter().println("Header field 'AS2-From' not found.");
+ return;
+ }
+
+ SpanContext spanContext = (SpanContext) request.getAttribute(TracingFilter.SERVER_SPAN_CONTEXT);
+
+ Span root = tracer.buildSpan("as2servlet.post").asChildOf(spanContext).start();
+
+ // Receives the data, validates the headers, signature etc., invokes the persistence handler
+ // and finally returns the MdnData to be sent back to the caller
+ try {
+ root.setTag("message-id", request.getHeader("message-id"));
+ MDC.put("message-id", request.getHeader("message-id"));
+
+ // Read all headers
+ InternetHeaders headers = new InternetHeaders();
+ Collections.list(request.getHeaderNames())
+ .forEach(name -> headers.addHeader(name, request.getHeader(name)));
+
+ // Read MIME message
+ MimeMessage mimeMessage = MimeMessageHelper.parse(request.getInputStream(), headers);
+
+ try {
+ // Performs the actual reception of the message by parsing the HTTP POST request
+ // persisting the payload etc.
+
+ Span span = tracer.buildSpan("as2message").asChildOf(root).start();
+ MimeMessage mdn = inboundHandlerProvider.get().receive(headers, mimeMessage, span);
+ span.finish();
+
+ // Returns the MDN
+ span = tracer.buildSpan("mdn").asChildOf(root).start();
+ writeMdn(response, mdn, HttpServletResponse.SC_OK);
+ span.finish();
+
+ } catch (OxalisAs2InboundException e) {
+ String identifier = errorTracker.track(Direction.IN, e, true);
+
+ root.setTag("identifier", identifier);
+ root.setTag("exception", String.valueOf(e.getMessage()));
+
+ // Begin builder
+ MdnBuilder mdnBuilder = MdnBuilder.newInstance(mimeMessage);
+
+ // Original Message-Id
+ mdnBuilder.addHeader(MdnHeader.ORIGINAL_MESSAGE_ID, headers.getHeader(As2Header.MESSAGE_ID)[0]);
+
+ // Disposition from exception
+ mdnBuilder.addHeader(MdnHeader.DISPOSITION, e.getDisposition());
+ mdnBuilder.addText(String.format("Error [%s]", identifier), e.getMessage());
+
+ // Build and add headers
+ MimeMessage mdn = sMimeMessageFactory.createSignedMimeMessage(mdnBuilder.build(),
+ SMimeDigestMethod.findByIdentifier(SignedMessage.extractMicalg(mimeMessage)));
+ mdn.setHeader(As2Header.AS2_VERSION, As2Header.VERSION);
+ mdn.setHeader(As2Header.AS2_FROM, toIdentifier);
+ mdn.setHeader(As2Header.AS2_TO, headers.getHeader(As2Header.AS2_FROM)[0]);
+
+ writeMdn(response, mdn, HttpServletResponse.SC_BAD_REQUEST);
+ }
+ } catch (Exception e) {
+ String identifier = errorTracker.track(Direction.IN, e, false);
+
+ root.setTag("identifier", identifier);
+ root.setTag("exception", String.valueOf(e.getMessage()));
+
+ // Unexpected internal error, cannot proceed, return HTTP 500 and partly MDN to indicating the problem
+ writeFailureWithExplanation(request, response, e);
+ } finally {
+ MDC.remove("message-id");
+ root.finish();
+ }
+ }
+
+ protected void writeMdn(HttpServletResponse response, MimeMessage mdn, int status)
+ throws MessagingException, IOException {
+ // Set HTTP status.
+ response.setStatus(status);
+
+ // Add headers and collect header names.
+ Map headers = Collections.list((Enumeration) mdn.getAllHeaders()).stream()
+ .map(Header.class::cast)
+ .collect(Collectors.toMap(Header::getName, Header::getValue));
+
+ // Move headers
+ for (String name : headers.keySet()) {
+ response.setHeader(name, headers.get(name));
+ mdn.removeHeader(name);
+ }
+
+ // Write MDN content to response.
+ ByteStreams.copy(mdn.getInputStream(), response.getOutputStream());
+ }
+
+ /**
+ * If the AS2 message processing failed with an exception, we have an internal error and act accordingly
+ */
+ void writeFailureWithExplanation(HttpServletRequest request, HttpServletResponse response, Exception e)
+ throws IOException {
+ response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+
+ log.error("Request headers:");
+ Collections.list(request.getHeaderNames())
+ .forEach(name -> log.error("=> {}: {}", name, request.getHeader(name)));
+
+ response.getWriter().write("INTERNAL ERROR!!");
+ // Being helpful to those who must read the error logs
+ log.error("\n---------- REQUEST FAILURE INFORMATION ENDS HERE --------------");
+ }
+
+ /**
+ * Allows for simple http GET requests
+ */
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws IOException {
+ response.setStatus(HttpServletResponse.SC_OK);
+ response.getOutputStream().println("Hello AS2 world\n");
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/lang/OxalisAs2Exception.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/lang/OxalisAs2Exception.java
new file mode 100644
index 0000000000000000000000000000000000000000..9934061dfb77b2dff9d065cb8f721e0fb4f169e3
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/lang/OxalisAs2Exception.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.lang;
+
+import network.oxalis.api.lang.OxalisException;
+
+public class OxalisAs2Exception extends OxalisException {
+
+ public OxalisAs2Exception(String message) {
+ super(message);
+ }
+
+ public OxalisAs2Exception(String message, Throwable cause) {
+ super(message, cause);
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/lang/OxalisAs2InboundException.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/lang/OxalisAs2InboundException.java
new file mode 100644
index 0000000000000000000000000000000000000000..549c3b76604f88dfc9a28fe00c3962e6ffc33b19
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/lang/OxalisAs2InboundException.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.lang;
+
+import network.oxalis.as2.code.Disposition;
+
+/**
+ * @author erlend
+ */
+public class OxalisAs2InboundException extends OxalisAs2Exception {
+
+ private Disposition disposition;
+
+ public OxalisAs2InboundException(String message, Disposition disposition) {
+ super(message);
+ this.disposition = disposition;
+ }
+
+ public OxalisAs2InboundException(Disposition disposition, String message, Throwable cause) {
+ super(message, cause);
+ this.disposition = disposition;
+ }
+
+ public Disposition getDisposition() {
+ return disposition;
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/model/As2Disposition.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/model/As2Disposition.java
new file mode 100644
index 0000000000000000000000000000000000000000..a5c9bb95aa70420caf97547e3c09226a420949b3
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/model/As2Disposition.java
@@ -0,0 +1,268 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.model;
+
+import lombok.Getter;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Represents an instance of an AS2 Disposition header to be used in an MDN
+ *
+ * automatic-action/MDN-sent-automatically; processed/error: Unknown recipient
+ *
+ *
+ * @author steinar
+ * Date: 09.10.13
+ * Time: 21:06
+ */
+@Getter
+public class As2Disposition {
+
+ public static Pattern pattern = Pattern.compile("(?i)(manual-action|automatic-action)\\s*/\\s*(MDN-sent-automatically|MDN-sent-manually)\\s*;\\s*(processed|failed)\\s*(/\\s*(error|warning|failure)\\s*:?\\s*(.*)){0,1}");
+
+ ActionMode actionMode;
+
+ SendingMode sendingMode;
+
+ DispositionType dispositionType; // processed | failed
+
+ /**
+ * Optional. If present, a warning or an error was issued
+ */
+ DispositionModifier dispositionModifier;
+
+ public As2Disposition(ActionMode actionMode, SendingMode sendingMode, DispositionType dispositionType) {
+ this.actionMode = actionMode;
+ this.sendingMode = sendingMode;
+ this.dispositionType = dispositionType;
+ }
+
+ public As2Disposition(ActionMode actionMode, SendingMode sendingMode, DispositionType dispositionType, DispositionModifier dispositionModifier) {
+ this.actionMode = actionMode;
+ this.sendingMode = sendingMode;
+ this.dispositionType = dispositionType;
+
+ // Only processed/error or processed/warning is allowed
+ if (dispositionType == DispositionType.PROCESSED && (dispositionModifier.prefix == DispositionModifier.Prefix.FAILURE)) {
+ throw new IllegalArgumentException("DispositionType 'processed' does not allow a prefix of 'failed'. Only 'error' and 'warning' are allowed");
+ }
+ this.dispositionModifier = dispositionModifier;
+ }
+
+ public static As2Disposition processed() {
+ return new As2Disposition(ActionMode.AUTOMATIC, SendingMode.AUTOMATIC, DispositionType.PROCESSED);
+ }
+
+ public static As2Disposition processedWithWarning(String warningMessage) {
+ return new As2Disposition(ActionMode.AUTOMATIC, SendingMode.AUTOMATIC, DispositionType.PROCESSED, DispositionModifier.warning(warningMessage));
+ }
+
+ public static As2Disposition processedWithError(String errorMessage) {
+ return new As2Disposition(ActionMode.AUTOMATIC, SendingMode.AUTOMATIC, DispositionType.PROCESSED, DispositionModifier.error(errorMessage));
+ }
+
+ public static As2Disposition failed(String message) {
+ return new As2Disposition(ActionMode.AUTOMATIC, SendingMode.AUTOMATIC, DispositionType.FAILED, DispositionModifier.failed(message));
+ }
+
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder(actionMode.getTextValue() + "/" + sendingMode.getTextValue() + "; " + dispositionType.getTextValue());
+ if (dispositionModifier != null) {
+ sb.append('/');
+ sb.append(dispositionModifier.toString());
+ }
+ return sb.toString();
+ }
+
+
+ public static As2Disposition valueOf(String s) {
+ String str = s == null ? "" : s.trim();
+
+ Matcher matcher = pattern.matcher(str);
+ if (!matcher.matches()) {
+ throw new IllegalArgumentException("'" + str + "'" + " does not match pattern for As2Disposition");
+ }
+
+ String actionModeString = matcher.group(1);
+ ActionMode actionMode = ActionMode.createFromTextValue(actionModeString);
+
+ String sendingModeString = matcher.group(2);
+ SendingMode sendingMode = SendingMode.createFromTextValue(sendingModeString);
+
+ String dispositionTypeString = matcher.group(3);
+ DispositionType dispositionType = DispositionType.valueOf(dispositionTypeString.toUpperCase());
+
+ As2Disposition result;
+ if (matcher.group(4) != null) {
+ DispositionModifier dispositionModifier;
+ String dispositionModifierPrefixString = matcher.group(5);
+ String dispositionModifierString = matcher.group(6);
+ dispositionModifier = new DispositionModifier(DispositionModifier.Prefix.valueOf(dispositionModifierPrefixString.toUpperCase()), dispositionModifierString);
+ result = new As2Disposition(actionMode, sendingMode, dispositionType, dispositionModifier);
+ } else {
+ result = new As2Disposition(actionMode, sendingMode, dispositionType);
+ }
+
+ return result;
+ }
+
+ public enum ActionMode {
+ MANUAL("manual-action"), AUTOMATIC("automatic-action");
+
+ private final String textValue;
+
+ ActionMode(String textValue) {
+
+ this.textValue = textValue;
+ }
+
+ String getTextValue() {
+ return textValue;
+ }
+
+ public static ActionMode createFromTextValue(String textValue) {
+ for (ActionMode actionMode : values()) {
+ if (actionMode.getTextValue().equalsIgnoreCase(textValue)) {
+ return actionMode;
+ }
+ }
+ throw new IllegalArgumentException(textValue.toLowerCase() + " not recognised as a valid ActionMode");
+ }
+
+ }
+
+ public enum SendingMode {
+ MANUAL("MDN-sent-manually"), AUTOMATIC("MDN-sent-automatically");
+
+ private final String textValue;
+
+ SendingMode(String textValue) {
+ this.textValue = textValue;
+ }
+
+ public String getTextValue() {
+ return textValue;
+ }
+
+ public static SendingMode createFromTextValue(String textValue) {
+ for (SendingMode sendingMode : values()) {
+ if (sendingMode.getTextValue().equalsIgnoreCase(textValue)) {
+ return sendingMode;
+ }
+ }
+ throw new IllegalArgumentException(textValue.toLowerCase() + " not recognised as a valid ActionMode");
+ }
+ }
+
+ public enum DispositionType {
+ PROCESSED("processed"), FAILED("failed");
+
+ private final String textValue;
+
+ DispositionType(String textValue) {
+ this.textValue = textValue;
+ }
+
+ public String getTextValue() {
+ return textValue;
+ }
+
+ }
+
+ public static class DispositionModifier {
+
+ public enum Prefix {
+ ERROR, WARNING, FAILURE
+ }
+
+ private final Prefix prefix;
+
+ private final String dispositionModifierExtension;
+
+ DispositionModifier(Prefix prefix, String dispositionModifierExtension) {
+ this.prefix = prefix;
+ this.dispositionModifierExtension = dispositionModifierExtension;
+ }
+
+ public Prefix getPrefix() {
+ return prefix;
+ }
+
+ public String getDispositionModifierExtension() {
+ return dispositionModifierExtension;
+ }
+
+ public static DispositionModifier authenticationFailedError() {
+ return new DispositionModifier(Prefix.ERROR, "authentication-failed");
+ }
+
+ public static DispositionModifier decompressionFailedError() {
+ return new DispositionModifier(Prefix.ERROR, "decompression-failed");
+ }
+
+ public static DispositionModifier decryptionFailedError() {
+ return new DispositionModifier(Prefix.ERROR, "decryption-failed");
+ }
+
+ public static DispositionModifier insufficientMessageSecurityError() {
+ return new DispositionModifier(Prefix.ERROR, "insufficient-message-security");
+ }
+
+ public static DispositionModifier integrityCheckFailedError() {
+ return new DispositionModifier(Prefix.ERROR, "integrity-check-failed");
+ }
+
+ public static DispositionModifier unexpectedProcessingError() {
+ return new DispositionModifier(Prefix.ERROR, "unexpected-processing-error");
+ }
+
+ public static DispositionModifier warning(String description) {
+ return new DispositionModifier(Prefix.WARNING, description);
+ }
+
+ public static DispositionModifier unsupportedFormatFailure() {
+ return new DispositionModifier(Prefix.FAILURE, "unsupported format");
+ }
+
+ public static DispositionModifier unsupportedMicAlgorithms() {
+ return new DispositionModifier(Prefix.FAILURE, "unsupported MIC-algorithms");
+ }
+
+ public static DispositionModifier failed(String description) {
+ return new DispositionModifier(Prefix.FAILURE, description);
+ }
+
+ public static DispositionModifier error(String description) {
+ return new DispositionModifier(Prefix.ERROR, description);
+ }
+
+ @Override
+ public String toString() {
+ return prefix + ": " + dispositionModifierExtension;
+ }
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/model/As2DispositionNotificationOptions.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/model/As2DispositionNotificationOptions.java
new file mode 100644
index 0000000000000000000000000000000000000000..849eeab5407b726bba4beb1e0a7dde1c7c2e9a0a
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/model/As2DispositionNotificationOptions.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.model;
+
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.as2.util.SMimeDigestMethod;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Represents the AS2 Header Disposition-notifications-options
+ *
+ * The following input string should yield an As2DispositionNotificationOptions with two parameters:
+ *
+ * Disposition-notification-options: signed-receipt-protocol=required,pkcs7-signature;
+ * signed-receipt-micalg=required,sha1,md5
+ *
+ *
+ * The two parameters are:
+ *
+ * - signed-receipt-protocol
+ * - signed-receipt-micalg
+ *
+ *
+ * @author steinar
+ * Date: 17.10.13
+ * Time: 21:08
+ */
+@Slf4j
+public class As2DispositionNotificationOptions {
+
+ private static final Pattern PATTERN = Pattern.compile(
+ "(signed-receipt-protocol|signed-receipt-micalg)\\s*=\\s*(required|optional)\\s*,\\s*([^;]*)");
+
+ private final List parameters;
+
+ public static As2DispositionNotificationOptions getDefault(SMimeDigestMethod digestMethod) {
+ return valueOf("signed-receipt-protocol=required,pkcs7-signature; signed-receipt-micalg=required," +
+ digestMethod.getIdentifier());
+ }
+
+ public static As2DispositionNotificationOptions valueOf(String s) {
+ if (s == null) {
+ throw new IllegalArgumentException("Can not parse empty disposition-notification-options.");
+ }
+
+ List parameterList = new ArrayList<>();
+
+ log.debug("Inspecting " + s);
+ Matcher matcher = PATTERN.matcher(s);
+ while (matcher.find()) {
+ if (matcher.groupCount() != 3) {
+ throw new IllegalStateException("Internal error: Invalid group count in RegEx for parameter match in disposition-notification-options.");
+ }
+ String attributeName = matcher.group(1);
+ String importanceName = matcher.group(2);
+ String value = matcher.group(3);
+
+ Attribute attribute = Attribute.fromString(attributeName);
+ Importance importance = Importance.valueOf(importanceName.trim().toUpperCase());
+
+ Parameter parameter = Parameter.of(attribute, importance, value);
+ parameterList.add(parameter);
+ }
+
+ if (parameterList.isEmpty()) {
+ throw new IllegalArgumentException("Unable to create " + As2DispositionNotificationOptions.class.getSimpleName() + " from '" + s + "'");
+ }
+
+ return new As2DispositionNotificationOptions(parameterList);
+ }
+
+ public As2DispositionNotificationOptions(List parameters) {
+ this.parameters = parameters;
+ }
+
+ public List getParameters() {
+ return parameters;
+ }
+
+ private Parameter getParameterFor(Attribute attribute) {
+ for (Parameter parameter : parameters) {
+ if (parameter.attribute == attribute) {
+ return parameter;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * From the official AS2 spec page 22 :
+ * The "signed-receipt-micalg" parameter is a list of MIC algorithms
+ * preferred by the requester for use in signing the returned receipt.
+ * The list of MIC algorithms SHOULD be honored by the recipient from left to right.
+ */
+ public Parameter getSignedReceiptMicalg() {
+ return getParameterFor(Attribute.SIGNED_RECEIPT_MICALG);
+ }
+
+ /**
+ * @return Use the preferred mic algorithm for signed receipt, for PEPPOL AS2 this should be "sha1"
+ */
+ public String getPreferredSignedReceiptMicAlgorithmName() {
+ String preferredAlgorithm = "" + getSignedReceiptMicalg().getTextValue(); // text value could be "sha1, md5"
+ return preferredAlgorithm.split(",")[0].trim();
+ }
+
+ public Parameter getSignedReceiptProtocol() {
+ return getParameterFor(Attribute.SIGNED_RECEIPT_PROTOCOL);
+ }
+
+ @Override
+ public String toString() {
+ return String.format("%s; %s", getSignedReceiptProtocol(), getSignedReceiptMicalg());
+ }
+
+ static class Parameter {
+
+ Attribute attribute;
+
+ Importance importance;
+
+ String textValue;
+
+ Attribute getAttribute() {
+ return attribute;
+ }
+
+ Importance getImportance() {
+ return importance;
+ }
+
+ String getTextValue() {
+ return textValue;
+ }
+
+ public static Parameter of(Attribute attribute, Importance importance, String textValue) {
+ return new Parameter(attribute, importance, textValue);
+ }
+
+ Parameter(Attribute attribute, Importance importance, String textValue) {
+ this.attribute = attribute;
+ this.importance = importance;
+ this.textValue = textValue;
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder("")
+ .append(attribute).append("=")
+ .append(importance)
+ .append(",").append(textValue);
+
+ return sb.toString();
+ }
+ }
+
+ enum Attribute {
+
+ SIGNED_RECEIPT_PROTOCOL("signed-receipt-protocol"),
+ SIGNED_RECEIPT_MICALG("signed-receipt-micalg");
+ private final String text;
+
+ Attribute(String text) {
+ this.text = text;
+ }
+
+ /**
+ * This is needed as the textual representation of each enum value, contains dashes
+ */
+ static Attribute fromString(String s) {
+ if (s == null) {
+ throw new IllegalArgumentException("String value required");
+ }
+ for (Attribute attribute : values()) {
+ if (attribute.text.equalsIgnoreCase(s)) {
+ return attribute;
+ }
+ }
+
+ throw new IllegalArgumentException(s + " not recognized as an attribute of As2DispositionNotificationOptions");
+ }
+
+ @Override
+ public String toString() {
+ return text;
+ }
+ }
+
+ static enum Importance {
+ REQUIRED, OPTIONAL;
+
+
+ @Override
+ public String toString() {
+ return name().toLowerCase();
+ }
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/model/Mic.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/model/Mic.java
new file mode 100644
index 0000000000000000000000000000000000000000..f403fb884f5724c5b44afaf877c07027c279176a
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/model/Mic.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.model;
+
+import network.oxalis.as2.util.SMimeDigestMethod;
+import network.oxalis.vefa.peppol.common.model.Digest;
+
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
+import java.util.Objects;
+
+/**
+ * Value object holding the Message Integrity Control (MIC) of an AS2 message.
+ *
+ * @author steinar
+ */
+public class Mic {
+
+ private final String digestAsString;
+
+ private final SMimeDigestMethod algorithm;
+
+ public Mic(Digest digest) {
+ this(Base64.getEncoder().encodeToString(digest.getValue()),
+ SMimeDigestMethod.findByDigestMethod(digest.getMethod()));
+ }
+
+ public Mic(String digestAsString, SMimeDigestMethod algorithm) {
+ this.digestAsString = digestAsString;
+ this.algorithm = algorithm;
+ }
+
+ public static Mic valueOf(String receivedContentMic) throws NoSuchAlgorithmException {
+ String s[] = receivedContentMic.split(",");
+ if (s.length != 2) {
+ throw new IllegalArgumentException("Invalid mic: '" + receivedContentMic + "'. Required syntax: encoded-message-digest \",\" (sha1|md5)");
+ }
+ return new Mic(s[0].trim(), SMimeDigestMethod.findByIdentifier(s[1].trim()));
+ }
+
+ @Override
+ public String toString() {
+ return String.format("%s, %s", digestAsString, algorithm.getIdentifier());
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ Mic mic = (Mic) o;
+ return Objects.equals(digestAsString, mic.digestAsString) &&
+ algorithm == mic.algorithm;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(digestAsString, algorithm);
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/outbound/As2MessageSender.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/outbound/As2MessageSender.java
new file mode 100644
index 0000000000000000000000000000000000000000..56144f76177f562450194349e85e44458b6c0d68
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/outbound/As2MessageSender.java
@@ -0,0 +1,358 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.outbound;
+
+import com.google.common.io.ByteStreams;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.name.Named;
+import io.opentracing.Span;
+import io.opentracing.Tracer;
+import io.opentracing.contrib.apache.http.client.Constants;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.api.identifier.MessageIdGenerator;
+import network.oxalis.api.lang.OxalisSecurityException;
+import network.oxalis.api.lang.OxalisTransmissionException;
+import network.oxalis.api.lang.TimestampException;
+import network.oxalis.api.model.Direction;
+import network.oxalis.api.model.TransmissionIdentifier;
+import network.oxalis.api.outbound.TransmissionRequest;
+import network.oxalis.api.outbound.TransmissionResponse;
+import network.oxalis.api.timestamp.Timestamp;
+import network.oxalis.api.timestamp.TimestampProvider;
+import network.oxalis.as2.code.As2Header;
+import network.oxalis.as2.code.MdnHeader;
+import network.oxalis.as2.model.As2DispositionNotificationOptions;
+import network.oxalis.as2.model.Mic;
+import network.oxalis.as2.util.*;
+import network.oxalis.as2.lang.OxalisAs2Exception;
+import network.oxalis.commons.security.CertificateUtils;
+import network.oxalis.commons.tracing.Traceable;
+import network.oxalis.vefa.peppol.common.model.Digest;
+import network.oxalis.vefa.peppol.security.lang.PeppolSecurityException;
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.HttpHostConnectException;
+import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.protocol.BasicHttpContext;
+import org.apache.http.util.EntityUtils;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.InternetHeaders;
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMessage;
+import javax.net.ssl.SSLHandshakeException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.SocketTimeoutException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.X509Certificate;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * Not thread safe implementation of sender, which sends messages using the AS2 protocol.
+ * Stores the outbound MIC for verification against the mic received from the MDN later.
+ *
+ * @author steinar
+ * @author thore
+ * @author erlend
+ */
+@Slf4j
+class As2MessageSender extends Traceable {
+
+ /**
+ * Provider of HTTP clients.
+ */
+ private final Provider httpClientProvider;
+
+ private final SMimeMessageFactory sMimeMessageFactory;
+
+ /**
+ * Timestamp provider used to create timestamp "t3" (time of reception of transport specific receipt, MDN).
+ */
+ private final TimestampProvider timestampProvider;
+
+ private final String notificationAddress;
+
+ private final MessageIdGenerator messageIdGenerator;
+
+ /**
+ * Identifier from sender's certificate used during transmission in "AS2-From" header.
+ */
+ private final String fromIdentifier;
+
+ private TransmissionRequest transmissionRequest;
+
+ private TransmissionIdentifier transmissionIdentifier;
+
+ private Span root;
+
+ private Digest outboundMic;
+
+ /**
+ * Constructor expecting resources needed to perform transmission using AS2. All task required to be done once for
+ * all requests using this instance is done here.
+ *
+ * @param httpClientProvider Provider of HTTP clients.
+ * @param certificate Certificate of sender.
+ * @param sMimeMessageFactory Factory prepared to create S/MIME messages using our private key.
+ * @param timestampProvider Provider used to fetch timestamps.
+ * @param tracer Tracing tool.
+ */
+ @Inject
+ public As2MessageSender(Provider httpClientProvider, X509Certificate certificate,
+ SMimeMessageFactory sMimeMessageFactory, TimestampProvider timestampProvider,
+ @Named("as2-notification") String notificationAddress, MessageIdGenerator messageIdGenerator,
+ Tracer tracer) {
+ super(tracer);
+ this.httpClientProvider = httpClientProvider;
+ this.sMimeMessageFactory = sMimeMessageFactory;
+ this.timestampProvider = timestampProvider;
+ this.notificationAddress = notificationAddress;
+ this.messageIdGenerator = messageIdGenerator;
+
+ // Establishes our AS2 System Identifier based upon the contents of the CN= field of the certificate
+ this.fromIdentifier = CertificateUtils.extractCommonName(certificate);
+ }
+
+ public TransmissionResponse send(TransmissionRequest transmissionRequest, Span root)
+ throws OxalisTransmissionException {
+ this.transmissionRequest = transmissionRequest;
+
+ this.root = tracer.buildSpan("Send AS2 message").asChildOf(root).start();
+ try {
+ return sendHttpRequest(prepareHttpRequest());
+ } catch (OxalisTransmissionException e) {
+ this.root.setTag("exception", e.getMessage());
+ throw e;
+ } finally {
+ root.finish();
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ protected HttpPost prepareHttpRequest() throws OxalisTransmissionException {
+ Span span = tracer.buildSpan("request").asChildOf(root).start();
+ try {
+ // Create the body part of the MIME message containing our content to be transmitted.
+ MimeBodyPart mimeBodyPart = MimeMessageHelper
+ .createMimeBodyPart(transmissionRequest.getPayload(), "application/xml");
+
+ // Digest method to use.
+ SMimeDigestMethod digestMethod = SMimeDigestMethod.findByTransportProfile(
+ transmissionRequest.getEndpoint().getTransportProfile());
+
+ outboundMic = MimeMessageHelper.calculateMic(mimeBodyPart, digestMethod);
+ span.setTag("mic", outboundMic.toString());
+ span.setTag("endpoint url", transmissionRequest.getEndpoint().getAddress().toString());
+
+ // Create Message-Id
+ String messageId = messageIdGenerator.generate(transmissionRequest);
+
+ if (!MessageIdUtil.verify(messageId))
+ throw new OxalisTransmissionException("Invalid Message-ID '" + messageId + "' generated.");
+
+ span.setTag("message-id", messageId);
+ transmissionIdentifier = TransmissionIdentifier.fromHeader(messageId);
+
+ // Create a complete S/MIME message using the body part containing our content as the
+ // signed part of the S/MIME message.
+ MimeMessage signedMimeMessage = sMimeMessageFactory
+ .createSignedMimeMessage(mimeBodyPart, digestMethod);
+ // .createSignedMimeMessageNew(mimeBodyPart, outboundMic, digestMethod);
+
+ //try (OutputStream outputStream = Files.newOutputStream(Paths.get(UUID.randomUUID().toString()))) {
+ // signedMimeMessage.writeTo(outputStream);
+ //}
+
+ // Get all headers in S/MIME message.
+ Map headers = ((List) Collections.list(signedMimeMessage.getAllHeaders())).stream()
+ .collect(Collectors.toMap(javax.mail.Header::getName, h -> h.getValue().replace("\r\n\t", "")));
+
+ // Clear headers in MIME content
+ for (String name : headers.keySet())
+ signedMimeMessage.removeHeader(name);
+
+ // Initiate POST request
+ HttpPost httpPost = new HttpPost(transmissionRequest.getEndpoint().getAddress());
+
+ // Inserts the S/MIME message to be posted.
+ HttpEntity httpEntity = new ByteArrayEntity(ByteStreams.toByteArray(signedMimeMessage.getInputStream()));
+ httpPost.setEntity(httpEntity);
+
+ // Set all headers.
+ httpPost.addHeader(As2Header.MESSAGE_ID, messageId);
+ httpPost.addHeader(As2Header.MIME_VERSION, headers.get(As2Header.MIME_VERSION));
+ httpPost.addHeader(As2Header.CONTENT_TYPE, headers.get(As2Header.CONTENT_TYPE));
+ httpPost.addHeader(As2Header.AS2_FROM, fromIdentifier);
+ httpPost.setHeader(As2Header.AS2_TO, CertificateUtils.extractCommonName(
+ transmissionRequest.getEndpoint().getCertificate()));
+ httpPost.addHeader(As2Header.DISPOSITION_NOTIFICATION_TO, notificationAddress);
+ httpPost.addHeader(As2Header.DISPOSITION_NOTIFICATION_OPTIONS,
+ As2DispositionNotificationOptions.getDefault(digestMethod).toString());
+ httpPost.addHeader(As2Header.AS2_VERSION, As2Header.VERSION);
+ httpPost.addHeader(As2Header.SUBJECT, "AS2 message from Oxalis");
+ httpPost.addHeader(As2Header.DATE, As2DateUtil.RFC822.format(new Date()));
+
+ return httpPost;
+ } catch (MessagingException | IOException e) {
+ throw new OxalisTransmissionException("Unexpected error during preparation of AS2 message.", e);
+ } finally {
+ span.finish();
+ }
+ }
+
+ protected TransmissionResponse sendHttpRequest(HttpPost httpPost) throws OxalisTransmissionException {
+ Span span = tracer.buildSpan("execute").asChildOf(root).start();
+ try (CloseableHttpClient httpClient = httpClientProvider.get()) {
+ BasicHttpContext basicHttpContext = new BasicHttpContext();
+ basicHttpContext.setAttribute(Constants.PARENT_CONTEXT, span.context());
+
+ CloseableHttpResponse response = httpClient.execute(httpPost, basicHttpContext);
+
+ span.finish();
+
+ return handleResponse(response);
+ } catch (SocketTimeoutException e) {
+ span.setTag("exception", String.valueOf(e.getMessage()));
+ throw new OxalisTransmissionException("Receiving server has not sent anything back within SOCKET_TIMEOUT", transmissionRequest.getEndpoint().getAddress(), e);
+ } catch (HttpHostConnectException e) {
+ span.setTag("exception", e.getMessage());
+ throw new OxalisTransmissionException("Receiving server does not seem to be running.",
+ transmissionRequest.getEndpoint().getAddress(), e);
+ } catch (SSLHandshakeException e) {
+ span.setTag("exception", e.getMessage());
+ throw new OxalisTransmissionException("Possible invalid SSL Certificate at the other end.",
+ transmissionRequest.getEndpoint().getAddress(), e);
+ } catch (IOException e) {
+ span.setTag("exception", String.valueOf(e.getMessage()));
+ throw new OxalisTransmissionException(transmissionRequest.getEndpoint().getAddress(), e);
+ } finally {
+ span.finish();
+ }
+ }
+
+ protected TransmissionResponse handleResponse(CloseableHttpResponse closeableHttpResponse)
+ throws OxalisTransmissionException {
+ Span span = tracer.buildSpan("response").asChildOf(root).start();
+ try (CloseableHttpResponse response = closeableHttpResponse) {
+ span.setTag("code", String.valueOf(response.getStatusLine().getStatusCode()));
+
+ if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
+ log.error("AS2 HTTP POST expected HTTP OK, but got : {} from {}",
+ response.getStatusLine().getStatusCode(), transmissionRequest.getEndpoint().getAddress());
+
+ // Throws exception
+ handleFailedRequest(response);
+ }
+
+ // handle normal HTTP OK response
+ log.debug("AS2 transmission to {} returned HTTP OK, verify MDN response",
+ transmissionRequest.getEndpoint().getAddress());
+
+ // Verify existence of Content-Type
+ if (!response.containsHeader("Content-Type"))
+ throw new OxalisTransmissionException("No Content-Type header in response, probably a server error.");
+
+ // Read MIME message
+ MimeMessage mimeMessage = MimeMessageHelper.parse(
+ response.getEntity().getContent(),
+ Stream.of(response.getAllHeaders()).map(Header::toString)
+ );
+
+ SignedMessage message;
+
+ try {
+ message = SignedMessage.load(mimeMessage);
+ message.validate(transmissionRequest.getEndpoint().getCertificate());
+ } catch (OxalisAs2Exception e) {
+ throw new OxalisTransmissionException("Unable to parse received MDN.", e);
+ } catch (OxalisSecurityException | PeppolSecurityException e) {
+ throw new OxalisTransmissionException(
+ "Unable to verify content of MDN using certificate provided by SMP.", e);
+ }
+
+ // Timestamp of reception of MDN
+ Timestamp t3 = timestampProvider.generate(message.getSignature(), Direction.OUT);
+
+ // Verifies the actual MDN
+ MdnMimeMessageInspector mdnMimeMessageInspector = new MdnMimeMessageInspector(mimeMessage);
+ String msg = mdnMimeMessageInspector.getPlainTextPartAsText();
+
+ if (!mdnMimeMessageInspector.isOkOrWarning(new Mic(outboundMic))) {
+ log.error("AS2 transmission failed with some error message '{}'.", msg);
+ throw new OxalisTransmissionException(String.format("AS2 transmission failed : %s", msg));
+ }
+
+ // Read structured content
+ MimeBodyPart mimeBodyPart = (MimeBodyPart) mdnMimeMessageInspector.getMessageDispositionNotificationPart();
+ InternetHeaders internetHeaders = new InternetHeaders((InputStream) mimeBodyPart.getContent());
+
+ // Fetch timestamp if set
+ Date date = t3.getDate();
+ if (internetHeaders.getHeader(MdnHeader.DATE) != null)
+ date = As2DateUtil.RFC822.parse(internetHeaders.getHeader(MdnHeader.DATE)[0]);
+
+ // Return TransmissionResponse
+ return new As2TransmissionResponse(transmissionIdentifier, transmissionRequest,
+ outboundMic, MimeMessageHelper.toBytes(mimeMessage), t3, date);
+ } catch (TimestampException | IOException e) {
+ throw new OxalisTransmissionException(e.getMessage(), e);
+ } catch (NoSuchAlgorithmException | MessagingException e) {
+ throw new OxalisTransmissionException(String.format("Unable to parseOld received MDN: %s", e.getMessage()), e);
+ } finally {
+ span.finish();
+ }
+ }
+
+ protected void handleFailedRequest(HttpResponse response) throws OxalisTransmissionException {
+ HttpEntity entity = response.getEntity(); // Any results?
+ try {
+ if (entity == null) {
+ // No content returned
+ throw new OxalisTransmissionException(
+ String.format("Request failed with rc=%s, no content returned in HTTP response",
+ response.getStatusLine().getStatusCode()));
+ } else {
+ String contents = EntityUtils.toString(entity);
+ throw new OxalisTransmissionException(
+ String.format("Request failed with rc=%s, contents received (%s characters): %s",
+ response.getStatusLine().getStatusCode(), contents.trim().length(), contents));
+ }
+ } catch (IOException e) {
+ throw new OxalisTransmissionException(
+ String.format("Request failed with rc=%s, ERROR while retrieving the contents of the response: %s",
+ response.getStatusLine().getStatusCode(), e.getMessage()), e);
+ }
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/outbound/As2MessageSenderFacade.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/outbound/As2MessageSenderFacade.java
new file mode 100644
index 0000000000000000000000000000000000000000..32b84d8eb2f401c3b349327ff126892b9437839c
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/outbound/As2MessageSenderFacade.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.outbound;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import io.opentracing.Span;
+import io.opentracing.Tracer;
+import network.oxalis.api.lang.OxalisTransmissionException;
+import network.oxalis.api.outbound.MessageSender;
+import network.oxalis.api.outbound.TransmissionRequest;
+import network.oxalis.api.outbound.TransmissionResponse;
+import network.oxalis.commons.tracing.Traceable;
+
+class As2MessageSenderFacade extends Traceable implements MessageSender {
+
+ private Provider messageSenderProvider;
+
+ @Inject
+ public As2MessageSenderFacade(Tracer tracer, Provider messageSenderProvider) {
+ super(tracer);
+ this.messageSenderProvider = messageSenderProvider;
+ }
+
+ @Override
+ public TransmissionResponse send(TransmissionRequest transmissionRequest) throws OxalisTransmissionException {
+ Span span = tracer.buildSpan(getClass().getSimpleName()).start();
+ try {
+ return send(transmissionRequest, span);
+ } finally {
+ span.finish();
+ }
+ }
+
+ @Override
+ public TransmissionResponse send(TransmissionRequest transmissionRequest, Span root)
+ throws OxalisTransmissionException {
+ return messageSenderProvider.get().send(transmissionRequest, root);
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/outbound/As2OutboundModule.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/outbound/As2OutboundModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..0a076e4a9a6f76e1211a09a84721a9bee4186887
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/outbound/As2OutboundModule.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.outbound;
+
+import com.google.inject.Key;
+import com.google.inject.name.Names;
+import network.oxalis.api.outbound.MessageSender;
+import network.oxalis.commons.guice.OxalisModule;
+
+/**
+ * Guice module providing AS2 implementation for outbound.
+ *
+ * @author erlend
+ * @since 4.0.0
+ */
+public class As2OutboundModule extends OxalisModule {
+
+ @Override
+ protected void configure() {
+ bind(Key.get(MessageSender.class, Names.named("oxalis-as2")))
+ .to(As2MessageSenderFacade.class);
+
+ bind(As2MessageSender.class);
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/outbound/As2TransmissionResponse.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/outbound/As2TransmissionResponse.java
new file mode 100644
index 0000000000000000000000000000000000000000..a23b0546515393f3c90afe8cc401813975d15051
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/outbound/As2TransmissionResponse.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.outbound;
+
+import network.oxalis.api.tag.Tag;
+import network.oxalis.api.model.TransmissionIdentifier;
+import network.oxalis.api.outbound.TransmissionRequest;
+import network.oxalis.api.outbound.TransmissionResponse;
+import network.oxalis.api.timestamp.Timestamp;
+import network.oxalis.vefa.peppol.common.model.*;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Implementation of {@link TransmissionResponse} for use in AS2.
+ *
+ * @author steinar
+ * @author thore
+ * @author erlend
+ */
+class As2TransmissionResponse implements TransmissionResponse, Serializable {
+
+ private static final long serialVersionUID = 4288900204693153668L;
+
+ private final Tag tag;
+
+ private final Header header;
+
+ private final Endpoint endpoint;
+
+ private final TransmissionIdentifier transmissionIdentifier;
+
+ private final Digest digest;
+
+ private final Receipt receipt;
+
+ private final List receipts;
+
+ private final Date timestamp;
+
+ public As2TransmissionResponse(TransmissionIdentifier transmissionIdentifier,
+ TransmissionRequest transmissionRequest, Digest digest,
+ byte[] nativeEvidenceBytes, Timestamp timestamp, Date date) {
+ this.tag = transmissionRequest.getTag();
+ this.header = transmissionRequest.getHeader();
+ this.endpoint = transmissionRequest.getEndpoint();
+ this.transmissionIdentifier = transmissionIdentifier;
+ this.digest = digest;
+ this.receipt = Receipt.of("message/disposition-notification", nativeEvidenceBytes);
+ this.timestamp = date;
+
+ List receipts = new ArrayList<>();
+ receipts.add(receipt);
+ if (timestamp.getReceipt().isPresent())
+ receipts.add(timestamp.getReceipt().get());
+ this.receipts = Collections.unmodifiableList(receipts);
+ }
+
+ @Override
+ public Tag getTag() {
+ return tag;
+ }
+
+ @Override
+ public Header getHeader() {
+ return header;
+ }
+
+ @Override
+ public TransmissionIdentifier getTransmissionIdentifier() {
+ return transmissionIdentifier;
+ }
+
+ @Override
+ public List getReceipts() {
+ return receipts;
+ }
+
+ @Override
+ public Endpoint getEndpoint() {
+ return endpoint;
+ }
+
+ @Override
+ public Receipt primaryReceipt() {
+ return receipt;
+ }
+
+ @Override
+ public Digest getDigest() {
+ return digest;
+ }
+
+ @Override
+ public TransportProtocol getTransportProtocol() {
+ return TransportProtocol.AS2;
+ }
+
+ @Override
+ public Date getTimestamp() {
+ return timestamp;
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/As2DateUtil.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/As2DateUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..0984b00479533553b9e83ec2fafcfbebfffb5eaa
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/As2DateUtil.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.util;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+/**
+ * Ensures that all date time objects are parsed and formatted according to the specifications in RFC4130.
+ *
+ * RFC-4130 references RFC-2045, which references RFC-1123, which references good old RFC-822.
+ *
+ * date-time = [ day "," ] date time ; dd mm yy
+ * ; hh:mm:ss zzz
+ *
+ * day = "Mon" / "Tue" / "Wed" / "Thu"
+ * / "Fri" / "Sat" / "Sun"
+ *
+ * date = 1*2DIGIT month 4DIGIT ; day month year(4 digits)
+ * ; e.g. 20 Jun 82
+ *
+ * month = "Jan" / "Feb" / "Mar" / "Apr"
+ * / "May" / "Jun" / "Jul" / "Aug"
+ * / "Sep" / "Oct" / "Nov" / "Dec"
+ *
+ * time = hour zone ; ANSI and Military
+ *
+ * hour = 2DIGIT ":" 2DIGIT [":" 2DIGIT]
+ * ; 00:00:00 - 23:59:59
+ *
+ * zone = "UT" / "GMT" ; Universal Time
+ * ; North American : UT
+ * / "EST" / "EDT" ; Eastern: - 5/ - 4
+ * / "CST" / "CDT" ; Central: - 6/ - 5
+ * / "MST" / "MDT" ; Mountain: - 7/ - 6
+ * / "PST" / "PDT" ; Pacific: - 8/ - 7
+ * / 1ALPHA ; Military: Z = UT;
+ * ; A:-1; (J not used)
+ * ; M:-12; N:+1; Y:+12
+ * / ( ("+" / "-") 4DIGIT ) ; Local differential
+ * ; hours+min. (HHMM)
+ *
+ *
+ * @author steinar
+ * @author erlend
+ * @see "RFC-4130"
+ * @see "RFC-2045"
+ * @see "RFC-1123"
+ * @see "RFC-822"
+ */
+public enum As2DateUtil {
+
+ RFC822("EEE, dd MMM yyyy HH:mm:ss Z"),
+ ISO8601("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
+
+ private String format;
+
+ As2DateUtil(String format) {
+ this.format = format;
+ }
+
+ public Date parse(String s) {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format, Locale.ENGLISH);
+
+ try {
+ return simpleDateFormat.parse(s);
+ } catch (ParseException e) {
+ throw new IllegalStateException(e.getMessage(), e);
+ }
+ }
+
+ public String format(Date d) {
+ return new SimpleDateFormat(format, Locale.ENGLISH).format(d);
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/HeaderUtil.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/HeaderUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..28dcad5f8943b5820c227b33d69f4fd5013608a5
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/HeaderUtil.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.util;
+
+import javax.mail.internet.InternetHeaders;
+
+/**
+ * @author steinar
+ * Date: 18.11.13
+ * Time: 15:56
+ */
+public class HeaderUtil {
+
+ public static String getFirstValue(InternetHeaders internetHeaders, String httpHeaderName) {
+ String[] value = internetHeaders.getHeader(httpHeaderName);
+ if (value == null) {
+ return null;
+ } else
+ return value[0]; //To change body of created methods use File | Settings | File Templates.
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/MdnBuilder.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/MdnBuilder.java
new file mode 100644
index 0000000000000000000000000000000000000000..f596b2189e86249b4d65f6157cfe77434a6e761c
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/MdnBuilder.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.util;
+
+import com.sun.mail.util.LineOutputStream;
+import network.oxalis.as2.code.As2Header;
+import network.oxalis.as2.code.Disposition;
+import network.oxalis.as2.code.MdnHeader;
+import network.oxalis.commons.util.OxalisVersion;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.InternetHeaders;
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Base64;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Enumeration;
+
+public class MdnBuilder {
+
+ private static final String ISSUER = String.format("Oxalis %s", OxalisVersion.getVersion());
+
+ private InternetHeaders headers = new InternetHeaders();
+
+ private ByteArrayOutputStream textOutputStream = new ByteArrayOutputStream();
+
+ private LineOutputStream textLineOutputStream = new LineOutputStream(textOutputStream);
+
+ public static MdnBuilder newInstance(MimeMessage mimeMessage) throws MessagingException, IOException {
+ MdnBuilder mdnBuilder = new MdnBuilder();
+ mdnBuilder.addHeader(MdnHeader.REPORTING_UA, ISSUER);
+
+ String recipient = String.format("rfc822; %s", mimeMessage.getHeader(As2Header.AS2_TO)[0]);
+ mdnBuilder.addHeader(MdnHeader.ORIGINAL_RECIPIENT, recipient);
+ mdnBuilder.addHeader(MdnHeader.FINAL_RECIPIENT, recipient);
+
+ mdnBuilder.textLineOutputStream.writeln("= Received headers");
+ mdnBuilder.textLineOutputStream.writeln();
+ for (String header : Collections.list((Enumeration) mimeMessage.getAllHeaderLines()))
+ mdnBuilder.textLineOutputStream.writeln(header);
+ mdnBuilder.textLineOutputStream.writeln();
+
+ return mdnBuilder;
+ }
+
+ private MdnBuilder() {
+ // No action.
+ }
+
+ public void addText(String title, String text) throws IOException {
+ textLineOutputStream.writeln(String.format("= %s", title));
+ textLineOutputStream.writeln();
+ textLineOutputStream.writeln(String.valueOf(text));
+ textLineOutputStream.writeln();
+ }
+
+ public void addHeader(String name, String value) {
+ headers.addHeader(name, value);
+ }
+
+ public void addHeader(String name, Date value) {
+ headers.addHeader(name, As2DateUtil.RFC822.format(value));
+ }
+
+ public void addHeader(String name, byte[] value) {
+ headers.addHeader(name, Base64.getEncoder().encodeToString(value));
+ }
+
+ public void addHeader(String name, Object value) {
+ headers.addHeader(name, value.toString());
+ }
+
+ public void addHeader(String name, Disposition disposition) {
+ headers.addHeader(name, disposition.toString());
+ }
+
+ public MimeBodyPart build() throws MessagingException, IOException {
+ // Initiate multipart
+ MimeMultipart mimeMultipart = new MimeMultipart();
+ mimeMultipart.setSubType("report; Report-Type=disposition-notification");
+
+ // Insert text part
+ MimeBodyPart textPart = new MimeBodyPart();
+ textLineOutputStream.close();
+ textPart.setContent(textOutputStream.toString("UTF-8"), "text/plain");
+ // textPart.setHeader("Content-Type", "text/plain");
+ mimeMultipart.addBodyPart(textPart);
+
+ // Extract headers
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ LineOutputStream lineOutputStream = new LineOutputStream(outputStream);
+ for (String header : Collections.list((Enumeration) headers.getAllHeaderLines()))
+ lineOutputStream.writeln(header);
+ lineOutputStream.close();
+
+ // Insert header part
+ MimeBodyPart headerPart = new MimeBodyPart();
+ headerPart.setContent(outputStream.toString(), "message/disposition-notification");
+ mimeMultipart.addBodyPart(headerPart);
+
+ MimeBodyPart mimeBodyPart = new MimeBodyPart();
+ mimeBodyPart.setContent(mimeMultipart, mimeMultipart.getContentType());
+ return mimeBodyPart;
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/MdnMimeMessageInspector.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/MdnMimeMessageInspector.java
new file mode 100644
index 0000000000000000000000000000000000000000..622f07f247eef0bcd030e452d1cf913f713db7c8
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/MdnMimeMessageInspector.java
@@ -0,0 +1,300 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.util;
+
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.as2.model.As2Disposition;
+import network.oxalis.as2.model.Mic;
+import org.apache.commons.codec.binary.Base64InputStream;
+
+import javax.mail.BodyPart;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.security.NoSuchAlgorithmException;
+import java.util.Locale;
+import java.util.Map;
+import java.util.TreeMap;
+
+/**
+ * Inspects the various properties and parts of an MDN wrapped in a S/MIME message.
+ *
+ * This class is typically used by the sender of the business message, which will receive
+ * an MDN from the receiving party.
+ *
+ * Part 0 : multipart/report; report-type=disposition-notification;
+ * 0 : Sub part 0 : text/plain
+ * 0 : Sub part 1 : message/disposition-notification
+ * 0 : Sub part x : will not be used by Oxalis
+ * Part 1 : application/pkcs7-signature; name=smime.p7s; smime-type=signed-data
+ *
+ * @author steinar
+ * @author thore
+ *
+ * @author aaron-kumar
+ * @since 5.0.0
+ *
+ */
+@Slf4j
+public class MdnMimeMessageInspector {
+
+ private final MimeMessage mdnMimeMessage;
+
+ public MdnMimeMessageInspector(MimeMessage mdnMimeMessage) {
+ this.mdnMimeMessage = mdnMimeMessage;
+ }
+
+ public MimeMultipart getSignedMultiPart() {
+ try {
+ return (MimeMultipart) mdnMimeMessage.getContent();
+ } catch (Exception e) {
+ throw new IllegalStateException(
+ "Unable to access the contents of the MDN S/MIME message: " + e.getMessage(), e);
+ }
+ }
+
+ /**
+ * The multipart/report should contain both a text/plain part with textual information and
+ * a message/disposition-notification part that should be examined for error/failure/warning.
+ */
+ public MimeMultipart getMultipartReport() {
+ try {
+ BodyPart bodyPart = getSignedMultiPart().getBodyPart(0);
+ MimeMultipart multipartReport = new MimeMultipart (bodyPart.getDataHandler().getDataSource());
+ if (!containsIgnoreCase(multipartReport.getContentType(), "multipart/report")) {
+ throw new IllegalStateException(
+ "The first body part of the first part of the signed message is not a multipart/report");
+ }
+ return multipartReport;
+ } catch (Exception e) {
+ throw new IllegalStateException("Unable to retrieve the multipart/report : " + e.getMessage(), e);
+ }
+ }
+
+ /**
+ * We assume that the first text/plain part is the one containing any textual information.
+ */
+ public BodyPart getPlainTextBodyPart() {
+ return getPartFromMultipartReport("text/plain");
+ }
+
+ /**
+ * We search for the first message/disposition-notification part.
+ * If we don't find one of that type we assume that part 2 is the right one.
+ */
+ public BodyPart getMessageDispositionNotificationPart() {
+ BodyPart bp = getPartFromMultipartReport("message/disposition-notification");
+ if (bp == null) bp = getBodyPartAt(1); // the second part should be machine readable
+ return bp;
+ }
+
+ /**
+ * Return the fist part which have the given contentType
+ *
+ * @param contentType the mime type to look for
+ */
+ private BodyPart getPartFromMultipartReport(String contentType) {
+ try {
+ MimeMultipart multipartReport = getMultipartReport();
+ for (int t = 0; t < multipartReport.getCount(); t++) {
+ BodyPart bp = multipartReport.getBodyPart(t);
+ if (containsIgnoreCase(bp.getContentType(), contentType))
+ return bp;
+ }
+ } catch (Exception e) {
+ log.error("Failed to locate part of multipart/report of type '{}'.", contentType, e);
+ }
+ return null;
+ }
+
+ /**
+ * Get a specific part of the multipart/report
+ *
+ * @param position starts at 0 for the first, 1 for the second, etc
+ */
+ private BodyPart getBodyPartAt(int position) {
+ try {
+ return getMultipartReport().getBodyPart(position);
+ } catch (Exception e) {
+ throw new IllegalStateException(
+ "Unable to retrieve the body part at position " + position + " : " + e.getMessage(), e);
+ }
+ }
+
+ public String getPlainTextPartAsText() {
+ try {
+ return getPlainTextBodyPart().getContent().toString();
+ } catch (Exception e) {
+ throw new IllegalStateException("Unable to retrieve the plain text from the MDN: " + e.getMessage(), e);
+ }
+ }
+
+ public Map getMdnFields() {
+ Map ret = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+ try {
+
+ BodyPart bp = getMessageDispositionNotificationPart();
+ boolean contentIsBase64Encoded = false;
+
+ //
+ // look for base64 transfer encoded MDN's (when Content-Transfer-Encoding is present)
+ //
+ // Content-Type: message/disposition-notification
+ // Content-Transfer-Encoding: base64
+ //
+ // "Content-Transfer-Encoding not used in HTTP transport Because HTTP, unlike SMTP,
+ // does not have an early history involving 7-bit restriction.
+ // There is no need to use the Content Transfer Encodings of MIME."
+ //
+ String[] contentTransferEncodings = bp.getHeader("Content-Transfer-Encoding");
+ if (contentTransferEncodings != null && contentTransferEncodings.length > 0) {
+ if (contentTransferEncodings.length > 1)
+ log.warn("MDN has multiple Content-Transfer-Encoding, we only try the first one");
+ String encoding = contentTransferEncodings[0];
+ if (encoding == null) encoding = "";
+ encoding = encoding.trim();
+ log.debug("MDN specifies Content-Transfer-Encoding : '" + encoding + "'");
+ if ("base64".equalsIgnoreCase(encoding)) {
+ contentIsBase64Encoded = true;
+ }
+ }
+
+ Object content = bp.getContent();
+ if (content instanceof InputStream) {
+ InputStream contentInputStream = (InputStream) content;
+
+ if (contentIsBase64Encoded) {
+ log.debug("MDN seems to be base64 encoded, wrapping content stream in Base64 decoding stream");
+ contentInputStream = new Base64InputStream(contentInputStream); // wrap in base64 decoding stream
+ }
+
+ BufferedReader r = new BufferedReader(new InputStreamReader(contentInputStream));
+ while (r.ready()) {
+ String line = r.readLine();
+ int firstColon = line.indexOf(":"); // "Disposition: ......"
+ if (firstColon > 0) {
+ String key = line.substring(0, firstColon).trim(); // up to :
+ String value = line.substring(firstColon + 1).trim(); // skip :
+ ret.put(key, value);
+ }
+ }
+ } else {
+ throw new Exception("Unsupported MDN content, expected InputStream found @ " + content.toString());
+ }
+
+
+ } catch (Exception e) {
+ throw new IllegalStateException("Unable to retrieve the values from the MDN : " + e.getMessage(), e);
+ }
+ return ret;
+ }
+
+ /**
+ * Decode MDN and make sure the message was processed (allow for warnings)
+ *
+ * @param outboundMic the outbound mic to verify against
+ */
+ public boolean isOkOrWarning(Mic outboundMic) throws NoSuchAlgorithmException {
+
+ Map mdnFields = getMdnFields();
+
+ /*
+ --------_=_NextPart_001_B096DD27.9007A6CE
+ Content-Type: message/disposition-notification
+
+ Reporting-UA: AS2 eefacta Server (unimaze.com)
+ Original-Recipient: rfc822; SMP_2000000005
+ Final-Recipient: rfc822; SMP_2000000005
+ Original-Message-ID: a60d9982-680c-4f01-9ab4-9b5d5fb05f37
+ Received-Content-MIC: ZMY/AoJb2JQS557MOATtc0EZdZQ=, sha1
+ Disposition: automatic-action/MDN-sent-automatically; processed
+
+
+ --------_=_NextPart_001_B096DD27.9007A6CE--
+ */
+
+ // make sure we have a valid disposition
+ String disposition = mdnFields.get("Disposition");
+ if (disposition == null) {
+ log.error("Unable to retreieve 'Disposition' from MDN");
+ return false;
+ }
+
+ log.debug("Decoding received disposition ({})", disposition);
+ As2Disposition as2dis = As2Disposition.valueOf(disposition);
+
+ // make sure we are in processed state
+ if (!As2Disposition.DispositionType.PROCESSED.equals(as2dis.getDispositionType())) {
+ // Disposition: automatic-action/MDN-sent-automatically; failed/failure: sender-equals-receiver
+ log.error("Failed or unknown state: {}", disposition);
+ return false;
+ }
+
+ // check if the returned MIC matches our outgoing MIC (sha1 of payload), warn about mic mismatch
+ String receivedMic = mdnFields.get("Received-Content-MIC");
+ if (receivedMic == null) {
+ log.error("MIC error, no Received-Content-MIC returned in MDN");
+ return false;
+ }
+ if (!outboundMic.equals(Mic.valueOf(receivedMic))) {
+ log.warn("MIC mismatch, received MIC was '{}' while sent MIC was '{}'.",
+ receivedMic, outboundMic.toString());
+ return false;
+ }
+
+ // return when "clean processing state" : Disposition: automatic-action/MDN-sent-automatically; processed
+ As2Disposition.DispositionModifier modifier = as2dis.getDispositionModifier();
+ if (modifier == null) return true;
+
+ // allow partial success (warning)
+ if (As2Disposition.DispositionModifier.Prefix.WARNING.equals(modifier.getPrefix())) {
+ // Disposition: automatic-action/MDN-sent-automatically; processed/warning: duplicate-document
+ log.warn("Returns with warning: {}", disposition);
+ return true;
+ }
+
+ // Disposition: automatic-action/MDN-sent-automatically; processed/error: insufficient-message-security
+ log.warn("MDN failed with disposition raw: {}", disposition);
+ log.warn("MDN failed with as2 disposition: {}", as2dis.toString());
+
+ return false;
+ }
+
+ /**
+ * Returns true if and only if the first param string contains the specified
+ * string of second parameter ignoring case.
+ *
+ * @param containerString the sequence to search for
+ * @param s the sequence to search for
+ * @return true if this string contains {@code s}, false otherwise
+ */
+ private static boolean containsIgnoreCase(String containerString, String s) {
+ if (containerString == null || s == null) {
+ return false;
+ }
+ return containerString.toLowerCase(Locale.ROOT).contains(s.toLowerCase(Locale.ROOT));
+ }
+
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/MessageIdUtil.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/MessageIdUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..ec378d941c8951cf6d24a7054fa1c6580e36aac8
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/MessageIdUtil.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2010-2017 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.util;
+
+import java.util.regex.Pattern;
+
+/**
+ * @author erlend
+ */
+public class MessageIdUtil {
+
+ private static final String ATEXT = "[A-Za-z0-9!#\\$%&'\\*\\+\\-/=\\?\\^_`\\{}\\|~]+";
+
+ private static final Pattern PATTERN =
+ Pattern.compile("^<" + ATEXT + "(\\." + ATEXT + ")*@" + ATEXT + "(\\." + ATEXT + ")*>$");
+
+ public static boolean verify(String identifier) {
+ return PATTERN.matcher(identifier).matches();
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/MimeMessageHelper.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/MimeMessageHelper.java
new file mode 100644
index 0000000000000000000000000000000000000000..a2c7c76715d37c3fe67aee3ef678a16a8896e11f
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/MimeMessageHelper.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.util;
+
+import com.google.common.io.ByteStreams;
+import network.oxalis.commons.bouncycastle.BCHelper;
+import network.oxalis.vefa.peppol.common.model.Digest;
+
+import javax.activation.DataHandler;
+import javax.mail.MessagingException;
+import javax.mail.Session;
+import javax.mail.internet.InternetHeaders;
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMessage;
+import javax.mail.util.ByteArrayDataSource;
+import java.io.*;
+import java.security.DigestOutputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * Collection of useful methods for manipulating MIME messages.
+ *
+ * @author Steinar Overbeck Cook
+ * @author Thore Johnsen
+ * @author Arun Kumar
+ */
+public class MimeMessageHelper {
+
+ private static final Session SESSION = Session.getDefaultInstance(System.getProperties(), null);
+
+ /**
+ * Creates a MIME message from the supplied stream, which must contain headers,
+ * especially the header "Content-Type:"
+ */
+ public static MimeMessage parse(InputStream inputStream) throws MessagingException {
+ return new MimeMessage(SESSION, inputStream);
+ }
+
+ /**
+ * Creates a MIME message from the supplied InputStream, using values from the HTTP headers to
+ * do a successful MIME decoding.
+ */
+ public static MimeMessage parse(InputStream inputStream, InternetHeaders headers)
+ throws MessagingException {
+
+ return parse(inputStream,
+ Collections.list((Enumeration) headers.getAllHeaderLines())
+ .stream()
+ .map(String.class::cast));
+ }
+
+ /**
+ * Parses a complete MIME message with provided headers.
+ *
+ * @param inputStream Content part of MIME message.
+ * @param headers Headers provided as a stream of Strings.
+ * @return Parsed MIME message.
+ * @throws MessagingException Thrown when content is successfully parsed.
+ * @since 4.0.2
+ */
+ public static MimeMessage parse(InputStream inputStream, Stream headers)
+ throws MessagingException {
+
+ // Read headers to a string
+ String headerString = headers.collect(Collectors.joining("\r\n")) + "\r\n\r\n";
+
+ // Parse content
+ return parse(new SequenceInputStream(
+ new ByteArrayInputStream(headerString.getBytes()),
+ inputStream
+ ));
+ }
+
+ public static MimeBodyPart createMimeBodyPart(InputStream inputStream, String mimeType) {
+ MimeBodyPart mimeBodyPart = new MimeBodyPart();
+ ByteArrayDataSource byteArrayDataSource;
+
+ try {
+ byteArrayDataSource = new ByteArrayDataSource(inputStream, mimeType);
+ } catch (IOException e) {
+ throw new IllegalStateException("Unable to create ByteArrayDataSource from inputStream." + e.getMessage(), e);
+ }
+
+ try {
+ DataHandler dh = new DataHandler(byteArrayDataSource);
+ mimeBodyPart.setDataHandler(dh);
+ } catch (MessagingException e) {
+ throw new IllegalStateException("Unable to set data handler on mime body part." + e.getMessage(), e);
+ }
+
+ try {
+ mimeBodyPart.setHeader("Content-Type", mimeType);
+ mimeBodyPart.setHeader("Content-Transfer-Encoding", "binary"); // No content-transfer-encoding needed for http
+ } catch (MessagingException e) {
+ throw new IllegalStateException("Unable to set headers." + e.getMessage(), e);
+ }
+
+ return mimeBodyPart;
+ }
+
+ /**
+ * Calculates sha1 mic based on the MIME body part.
+ */
+ public static Digest calculateMic(MimeBodyPart bodyPart, SMimeDigestMethod digestMethod) {
+ try {
+ MessageDigest md = BCHelper.getMessageDigest(digestMethod.getIdentifier());
+ bodyPart.writeTo(new DigestOutputStream(ByteStreams.nullOutputStream(), md));
+ return Digest.of(digestMethod.getDigestMethod(), md.digest());
+ } catch (NoSuchAlgorithmException e) {
+ throw new IllegalStateException(digestMethod.getIdentifier() + " not found", e);
+ } catch (IOException e) {
+ throw new IllegalStateException("Unable to read data from digest input. " + e.getMessage(), e);
+ } catch (MessagingException e) {
+ throw new IllegalStateException("Unable to handle mime body part. " + e.getMessage(), e);
+ }
+ }
+
+ public static byte[] toBytes(MimeMessage mimeMessage) {
+ ByteArrayOutputStream evidenceBytes = new ByteArrayOutputStream();
+ try {
+ mimeMessage.writeTo(evidenceBytes);
+ } catch (IOException | MessagingException e) {
+ throw new IllegalStateException("Unable to convert MDN mime message into bytes()", e);
+ }
+
+ return evidenceBytes.toByteArray();
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/SMimeBC.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/SMimeBC.java
new file mode 100644
index 0000000000000000000000000000000000000000..7c4b8004aa3008880744b936d9b9bc571a18d421
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/SMimeBC.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.util;
+
+import network.oxalis.api.lang.OxalisSecurityException;
+import network.oxalis.commons.bouncycastle.BCHelper;
+import org.bouncycastle.asn1.ASN1EncodableVector;
+import org.bouncycastle.asn1.DEROctetString;
+import org.bouncycastle.asn1.DERSet;
+import org.bouncycastle.asn1.DERUTCTime;
+import org.bouncycastle.asn1.cms.Attribute;
+import org.bouncycastle.asn1.cms.AttributeTable;
+import org.bouncycastle.asn1.cms.CMSAttributes;
+import org.bouncycastle.cert.X509CertificateHolder;
+import org.bouncycastle.cert.jcajce.JcaCertStore;
+import org.bouncycastle.cms.*;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.operator.OperatorCreationException;
+import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
+import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
+
+import java.io.IOException;
+import java.security.PrivateKey;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.X509Certificate;
+import java.util.Collections;
+import java.util.Date;
+
+public class SMimeBC {
+
+ static {
+ BCHelper.registerProvider();
+ }
+
+ public static byte[] createSignature(byte[] digest, SMimeDigestMethod digestMethod, PrivateKey privateKey,
+ X509Certificate certificate) throws OxalisSecurityException {
+ try {
+ ASN1EncodableVector signedAttributes = new ASN1EncodableVector();
+ signedAttributes.add(new Attribute(CMSAttributes.contentType, new DERSet(digestMethod.getOid())));
+ signedAttributes.add(new Attribute(CMSAttributes.messageDigest, new DERSet(new DEROctetString(digest))));
+ signedAttributes.add(new Attribute(CMSAttributes.signingTime, new DERSet(new DERUTCTime(new Date()))));
+
+ AttributeTable signedAttributesTable = new AttributeTable(signedAttributes);
+ signedAttributesTable.toASN1EncodableVector();
+ DefaultSignedAttributeTableGenerator signedAttributeGenerator = new DefaultSignedAttributeTableGenerator(signedAttributesTable);
+
+ /* Build the SignerInfo generator builder, that will build the generator... that will generate the SignerInformation... */
+ SignerInfoGeneratorBuilder signerInfoBuilder = new SignerInfoGeneratorBuilder(
+ new JcaDigestCalculatorProviderBuilder().setProvider(BouncyCastleProvider.PROVIDER_NAME).build());
+ signerInfoBuilder.setSignedAttributeGenerator(signedAttributeGenerator);
+ CMSSignedDataGenerator generator = new CMSSignedDataGenerator();
+ JcaContentSignerBuilder contentSigner =
+ new JcaContentSignerBuilder(digestMethod.getMethod()).setProvider(BouncyCastleProvider.PROVIDER_NAME);
+
+ generator.addSignerInfoGenerator(signerInfoBuilder.build(
+ contentSigner.build(privateKey), new X509CertificateHolder(certificate.getEncoded())));
+ generator.addCertificates(new JcaCertStore(Collections.singletonList(certificate)));
+
+ return generator.generate(new CMSAbsentContent()).getEncoded();
+ } catch (CMSException | IOException | CertificateEncodingException | OperatorCreationException e) {
+ throw new OxalisSecurityException(e.getMessage(), e);
+ }
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/SMimeDigestMethod.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/SMimeDigestMethod.java
new file mode 100644
index 0000000000000000000000000000000000000000..82e0a82aba216e4bc20e012db9105bc987a5d38d
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/SMimeDigestMethod.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.util;
+
+import network.oxalis.vefa.peppol.common.code.DigestMethod;
+import network.oxalis.vefa.peppol.common.model.TransportProfile;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
+import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
+import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
+
+import java.security.NoSuchAlgorithmException;
+
+public enum SMimeDigestMethod {
+
+ sha1(new String[]{"sha1", "sha-1", "rsa-sha1"}, "SHA1withRSA", "SHA-1", OIWObjectIdentifiers.idSHA1,
+ DigestMethod.SHA1, TransportProfile.PEPPOL_AS2_1_0),
+
+ sha256(new String[]{"sha256", "sha-256"}, "SHA256withRSA", "SHA-256", NISTObjectIdentifiers.id_sha256,
+ DigestMethod.SHA256, TransportProfile.PEPPOL_AS2_2_0),
+
+ sha512(new String[]{"sha512", "sha-512"}, "SHA512withRSA", "SHA-512", NISTObjectIdentifiers.id_sha512,
+ DigestMethod.SHA512, TransportProfile.of("busdox-transport-as2-ver1p0r1")),
+
+ ;
+
+ private final String[] identifier;
+
+ private final String method;
+
+ private final String algorithm;
+
+ private final ASN1ObjectIdentifier oid;
+
+ private final DigestMethod digestMethod;
+
+ private final TransportProfile transportProfile;
+
+ SMimeDigestMethod(String[] identifier, String method, String algorithm, ASN1ObjectIdentifier oid,
+ DigestMethod digestMethod, TransportProfile transportProfile) {
+ this.identifier = identifier;
+ this.method = method;
+ this.algorithm = algorithm;
+ this.oid = oid;
+ this.digestMethod = digestMethod;
+ this.transportProfile = transportProfile;
+ }
+
+ public String getIdentifier() {
+ return identifier[0];
+ }
+
+ public String getMethod() {
+ return method;
+ }
+
+ public String getAlgorithm() {
+ return algorithm;
+ }
+
+ public ASN1ObjectIdentifier getOid() {
+ return oid;
+ }
+
+ public DigestMethod getDigestMethod() {
+ return digestMethod;
+ }
+
+ public TransportProfile getTransportProfile() {
+ return transportProfile;
+ }
+
+ public static SMimeDigestMethod findByIdentifier(String identifier) throws NoSuchAlgorithmException {
+ String provided = String.valueOf(identifier).toLowerCase();
+
+ for (SMimeDigestMethod digestMethod : values())
+ for (String ident : digestMethod.identifier)
+ if (ident.equals(provided))
+ return digestMethod;
+
+ throw new NoSuchAlgorithmException(String.format(
+ "Digest method '%s' not known.", identifier));
+ }
+
+ public static SMimeDigestMethod findByTransportProfile(TransportProfile transportProfile) {
+ for (SMimeDigestMethod digestMethod : values())
+ if (digestMethod.transportProfile.equals(transportProfile))
+ return digestMethod;
+
+ throw new IllegalArgumentException(String.format(
+ "Digest method for transport profile '%s' not known.", transportProfile));
+ }
+
+ public static SMimeDigestMethod findByDigestMethod(DigestMethod digestMethod) {
+ for (SMimeDigestMethod method : values())
+ if (method.digestMethod.equals(digestMethod))
+ return method;
+
+ throw new IllegalArgumentException(String.format(
+ "Digest method '%s' not known.", digestMethod));
+ }
+}
+
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/SMimeMessageFactory.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/SMimeMessageFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..518ebc85c624ccbffb2814d64d0d3530f83d9924
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/SMimeMessageFactory.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.util;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import network.oxalis.api.lang.OxalisSecurityException;
+import network.oxalis.api.lang.OxalisTransmissionException;
+import network.oxalis.commons.bouncycastle.BCHelper;
+import network.oxalis.vefa.peppol.common.model.Digest;
+import org.bouncycastle.asn1.ASN1EncodableVector;
+import org.bouncycastle.asn1.cms.AttributeTable;
+import org.bouncycastle.cert.jcajce.JcaCertStore;
+import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.mail.smime.SMIMEException;
+import org.bouncycastle.mail.smime.SMIMESignedGenerator;
+import org.bouncycastle.operator.OperatorCreationException;
+import org.bouncycastle.util.Store;
+
+import javax.activation.DataHandler;
+import javax.activation.DataSource;
+import javax.activation.MimeType;
+import javax.mail.MessagingException;
+import javax.mail.Session;
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+import javax.mail.util.ByteArrayDataSource;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.security.PrivateKey;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.X509Certificate;
+import java.util.Collections;
+import java.util.Properties;
+
+/**
+ * Creates signed Mime messages
+ */
+@Singleton
+public class SMimeMessageFactory {
+
+ private final PrivateKey privateKey;
+
+ private final X509Certificate ourCertificate;
+
+ private final static Session session = Session.getDefaultInstance(System.getProperties(), null);
+
+ static {
+ BCHelper.registerProvider();
+ }
+
+ @Inject
+ public SMimeMessageFactory(PrivateKey privateKey, X509Certificate ourCertificate) {
+ this.privateKey = privateKey;
+ this.ourCertificate = ourCertificate;
+ }
+
+ /**
+ * Creates an S/MIME message from the supplied String, having the supplied MimeType as the "content-type".
+ *
+ * @param msg holds the payload of the message
+ * @param mimeType the MIME type to be used as the "Content-Type"
+ */
+ public MimeMessage createSignedMimeMessage(final String msg, MimeType mimeType, SMimeDigestMethod digestMethod)
+ throws OxalisTransmissionException {
+ return createSignedMimeMessage(new ByteArrayInputStream(msg.getBytes()), mimeType, digestMethod);
+ }
+
+ /**
+ * Creates a new S/MIME message having the supplied MimeType as the "content-type"
+ */
+ public MimeMessage createSignedMimeMessage(final InputStream inputStream, MimeType mimeType,
+ SMimeDigestMethod digestMethod) throws OxalisTransmissionException {
+ MimeBodyPart mimeBodyPart = MimeMessageHelper.createMimeBodyPart(inputStream, mimeType.toString());
+ return createSignedMimeMessage(mimeBodyPart, digestMethod);
+ }
+
+ /**
+ * Creates an S/MIME message using the supplied MimeBodyPart. The signature is generated using the private key
+ * as supplied in the constructor. Our certificate, which is required to verify the signature is enclosed.
+ */
+ public MimeMessage createSignedMimeMessage(MimeBodyPart mimeBodyPart, SMimeDigestMethod digestMethod)
+ throws OxalisTransmissionException {
+
+ //
+ // S/MIME capabilities are required, but we simply supply an empty vector
+ //
+ ASN1EncodableVector signedAttrs = new ASN1EncodableVector();
+
+ //
+ // create the generator for creating an smime/signed message
+ //
+ SMIMESignedGenerator smimeSignedGenerator = new SMIMESignedGenerator("binary"); //also see CMSSignedGenerator ?
+
+ //
+ // add a signer to the generator - this specifies we are using SHA1 and
+ // adding the smime attributes above to the signed attributes that
+ // will be generated as part of the signature. The encryption algorithm
+ // used is taken from the key - in this RSA with PKCS1Padding
+ //
+ try {
+ smimeSignedGenerator.addSignerInfoGenerator(new JcaSimpleSignerInfoGeneratorBuilder()
+ .setProvider(BouncyCastleProvider.PROVIDER_NAME)
+ .setSignedAttributeGenerator(new AttributeTable(signedAttrs))
+ // .build("SHA1withRSA", privateKey, ourCertificate));
+ .build(digestMethod.getMethod(), privateKey, ourCertificate));
+ } catch (OperatorCreationException e) {
+ throw new OxalisTransmissionException("Unable to add Signer information. " + e.getMessage(), e);
+ } catch (CertificateEncodingException e) {
+ throw new OxalisTransmissionException(String.format(
+ "Certificate encoding problems while adding signer information. %s", e.getMessage()), e);
+ }
+
+ //
+ // create a CertStore containing the certificates we want carried
+ // in the signature
+ //
+ Store certs;
+ try {
+ certs = new JcaCertStore(Collections.singleton(ourCertificate));
+ } catch (CertificateEncodingException e) {
+ throw new OxalisTransmissionException("Unable to create JcaCertStore with our certificate. " + e.getMessage(), e);
+ }
+ smimeSignedGenerator.addCertificates(certs);
+
+ //
+ // Signs the supplied MimeBodyPart
+ //
+ MimeMultipart mimeMultipart;
+ try {
+ mimeMultipart = smimeSignedGenerator.generate(mimeBodyPart);
+ } catch (SMIMEException e) {
+ throw new OxalisTransmissionException("Unable to generate signed mime multipart." + e.getMessage(), e);
+ }
+
+ //
+ // Get a Session object and create the mail message
+ //
+ Properties props = System.getProperties();
+ Session session = Session.getDefaultInstance(props, null);
+
+ MimeMessage mimeMessage = new MimeMessage(session);
+
+ try {
+ mimeMessage.setContent(mimeMultipart, mimeMultipart.getContentType());
+ } catch (MessagingException e) {
+ throw new OxalisTransmissionException("Unable to set Content type of MimeMessage. " + e.getMessage(), e);
+ }
+ try {
+ mimeMessage.saveChanges();
+ } catch (MessagingException e) {
+ throw new OxalisTransmissionException("Unable to save changes to Mime message. " + e.getMessage(), e);
+ }
+
+ return mimeMessage;
+ }
+
+ public MimeMessage createSignedMimeMessageNew(MimeBodyPart mimeBodyPart, Digest digest, SMimeDigestMethod digestMethod)
+ throws OxalisTransmissionException {
+ try {
+ MimeMultipart mimeMultipart = new MimeMultipart();
+ mimeMultipart.setSubType("signed");
+ mimeMultipart.addBodyPart(mimeBodyPart);
+
+ MimeBodyPart signaturePart = new MimeBodyPart();
+ DataSource dataSource = new ByteArrayDataSource(SMimeBC.createSignature(digest.getValue(), digestMethod, privateKey, ourCertificate), "application/pkcs7-signature");
+ signaturePart.setDataHandler(new DataHandler(dataSource));
+ signaturePart.setHeader("Content-Type", "application/pkcs7-signature; name=smime.p7s; smime-type=signed-data");
+ signaturePart.setHeader("Content-Transfer-Encoding", "base64");
+ signaturePart.setHeader("Content-Disposition", "attachment; filename=\"smime.p7s\"");
+ signaturePart.setHeader("Content-Description", "S/MIME Cryptographic Signature");
+ mimeMultipart.addBodyPart(signaturePart);
+
+ MimeMessage mimeMessage = new MimeMessage(session);
+ mimeMessage.setContent(mimeMultipart, mimeMultipart.getContentType());
+ mimeMessage.saveChanges();
+
+ return mimeMessage;
+ } catch (MessagingException | OxalisSecurityException e) {
+ throw new OxalisTransmissionException(e.getMessage(), e);
+ }
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/SignedMessage.java b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/SignedMessage.java
new file mode 100644
index 0000000000000000000000000000000000000000..007dcd9ee0a08fa5ba92e8c410460e5a48afc631
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/java/network/oxalis/as2/util/SignedMessage.java
@@ -0,0 +1,221 @@
+package network.oxalis.as2.util;
+
+import com.google.common.io.ByteStreams;
+import com.sun.mail.util.LineOutputStream;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.api.lang.OxalisSecurityException;
+import network.oxalis.as2.lang.OxalisAs2Exception;
+import network.oxalis.commons.bouncycastle.BCHelper;
+import network.oxalis.commons.security.CertificateUtils;
+import network.oxalis.vefa.peppol.common.code.Service;
+import network.oxalis.vefa.peppol.security.api.CertificateValidator;
+import network.oxalis.vefa.peppol.security.lang.PeppolSecurityException;
+import org.bouncycastle.cert.X509CertificateHolder;
+import org.bouncycastle.cms.CMSException;
+import org.bouncycastle.cms.SignerInformation;
+import org.bouncycastle.cms.SignerInformationVerifier;
+import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.mail.smime.SMIMESigned;
+import org.bouncycastle.operator.OperatorCreationException;
+import org.bouncycastle.util.CollectionStore;
+
+import javax.mail.MessagingException;
+import javax.mail.Session;
+import javax.mail.internet.ContentType;
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.Enumeration;
+
+/**
+ * @author erlend
+ */
+@Slf4j
+public class SignedMessage {
+
+ private static final Session SESSION = Session.getDefaultInstance(System.getProperties());
+
+ private MimeMultipart mimeMultipart;
+
+ private SMIMESigned smimeSigned;
+
+ // private List headers;
+
+ private byte[] signature;
+
+ private String micalg;
+
+ private X509Certificate signer;
+
+ private byte[] digest;
+
+ static {
+ BCHelper.registerProvider();
+ }
+
+ public static SignedMessage load(InputStream inputStream) throws IOException, MessagingException, OxalisAs2Exception {
+ return new SignedMessage(new MimeMessage(SESSION, inputStream));
+ }
+
+ public static SignedMessage load(MimeMessage mimeMessage) throws IOException, OxalisAs2Exception {
+ return new SignedMessage(mimeMessage);
+ }
+
+ private SignedMessage(MimeMessage message) throws IOException, OxalisAs2Exception {
+ try {
+ // Verify content type
+ if (!message.isMimeType("multipart/signed"))
+ throw new OxalisAs2Exception("Received content is not 'multipart/signed'.");
+
+ micalg = extractMicalg(message);
+
+ // Extract headers
+ //noinspection unchecked
+ // headers = Collections.list((Enumeration) message.getAllHeaders());
+
+ // Create MimeMultitype
+ mimeMultipart = (MimeMultipart) message.getContent();
+
+ // Extracting signature
+ signature = ByteStreams.toByteArray(mimeMultipart.getBodyPart(1).getInputStream());
+
+ // Create signed message
+ smimeSigned = new SMIMESigned(mimeMultipart);
+ } catch (CMSException | MessagingException e) {
+ throw new OxalisAs2Exception("Unable to parse received content.", e);
+ }
+ }
+
+ public InputStream getContent() throws IOException, OxalisSecurityException, OxalisAs2Exception {
+ try {
+ if (signer == null)
+ throw new OxalisSecurityException("Content is not validated.");
+
+ return smimeSigned.getContent().getInputStream();
+ } catch (MessagingException e) {
+ throw new OxalisAs2Exception("Unable to fetch content.", e);
+ }
+ }
+
+ public byte[] getContentBytes() throws IOException, OxalisSecurityException, OxalisAs2Exception {
+ return ByteStreams.toByteArray(getContent());
+ }
+
+ public String getMicalg() {
+ return micalg;
+ }
+
+ public X509Certificate getSigner() {
+ return signer;
+ }
+
+ public byte[] getDigest() {
+ return digest;
+ }
+
+ public byte[] getSignature() {
+ return signature;
+ }
+
+ /**
+ * Extracts headers of body MIME part. Creates headers as done by Bouncycastle.
+ *
+ * @return Headers
+ */
+ public byte[] getBodyHeader() throws IOException, OxalisAs2Exception {
+ try {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ LineOutputStream los = new LineOutputStream(outputStream);
+
+ Enumeration hdrLines = ((MimeBodyPart) mimeMultipart.getBodyPart(0)).getNonMatchingHeaderLines(new String[]{});
+ while (hdrLines.hasMoreElements())
+ los.writeln((String) hdrLines.nextElement());
+
+ // The CRLF separator between header and content
+ los.writeln();
+ los.close();
+
+ return outputStream.toByteArray();
+ } catch (MessagingException e) {
+ throw new OxalisAs2Exception("Unable to fetch body headers.", e);
+ }
+ }
+
+
+ public void validate(X509Certificate certificate) throws OxalisSecurityException, PeppolSecurityException {
+ try {
+ SignerInformationVerifier verifier = new JcaSimpleSignerInfoVerifierBuilder()
+ .setProvider(BouncyCastleProvider.PROVIDER_NAME)
+ .build(certificate.getPublicKey());
+
+ for (SignerInformation signerInformation : smimeSigned.getSignerInfos().getSigners()) {
+ if (signerInformation.verify(verifier)) {
+ signer = certificate;
+ digest = signerInformation.getContentDigest();
+ return;
+ }
+ }
+ } catch (CMSException e) {
+ throw new OxalisSecurityException(e.getMessage(), e);
+ } catch (OperatorCreationException e) {
+ throw new OxalisSecurityException("Unable to create SignerInformationVerifier.", e);
+ }
+
+ throw new PeppolSecurityException("Unable to verify signature.");
+ }
+
+ public void validate(Service service, CertificateValidator validator)
+ throws IOException, OxalisSecurityException, PeppolSecurityException {
+ validate(service, validator, null);
+ }
+
+ public void validate(Service service, CertificateValidator validator, String commonName)
+ throws IOException, OxalisSecurityException, PeppolSecurityException {
+ for (X509CertificateHolder holder : (CollectionStore) smimeSigned.getCertificates()) {
+ if (CertificateUtils.containsCommonName(holder.getSubject(), commonName)) {
+ try {
+ X509Certificate certificate = CertificateUtils.parseCertificate(holder.getEncoded());
+
+ if (isValid(service, validator, certificate)) {
+ validate(certificate);
+ return;
+ }
+ } catch (CertificateException e) {
+ log.debug("Unable to initiate certificate object.");
+ }
+ }
+ }
+
+ throw new OxalisSecurityException(commonName == null ?
+ "Unable to find valid certificate for validation of content." :
+ String.format("Unable to find valid certificate with CN '%s' for validation of content.", commonName));
+ }
+
+ private boolean isValid(Service service, CertificateValidator validator, X509Certificate certificate) {
+ try {
+ validator.validate(service, certificate);
+ return true;
+ } catch (PeppolSecurityException e) {
+ return false;
+ }
+ }
+
+ public static String extractMicalg(MimeMessage message) throws OxalisAs2Exception {
+ try {
+ ContentType contentType = new ContentType(message.getContentType());
+ String micalg = contentType.getParameter("micalg");
+ if (micalg == null)
+ throw new OxalisAs2Exception("Parameter 'micalg' is not provided.");
+
+ return micalg;
+ } catch (MessagingException e) {
+ throw new OxalisAs2Exception("Unable to fetch content type.", e);
+ }
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/main/resources/reference.conf b/oxalis-extension/oxalis-as2/src/main/resources/reference.conf
new file mode 100644
index 0000000000000000000000000000000000000000..aaf1f1f445b419a5c7ec8545cf542927bef98967
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/main/resources/reference.conf
@@ -0,0 +1,29 @@
+oxalis.module.as2.core = {
+ class = network.oxalis.as2.common.As2CommonModule
+}
+oxalis.module.as2.inbound = {
+ class = network.oxalis.as2.inbound.As2InboundModule
+ dependency = inbound.servlet
+}
+oxalis.module.as2.outbound = {
+ class = network.oxalis.as2.outbound.As2OutboundModule
+ dependency = outbound.lookup
+}
+
+defaults.transport.as2_sha1 = {
+ profile: busdox-transport-as2-ver1p0
+ sender: oxalis-as2
+ weight: 1000
+}
+
+defaults.transport.as2_sha256 = {
+ profile: busdox-transport-as2-ver2p0
+ sender: oxalis-as2
+ weight: 1500
+}
+
+defaults.transport.as2_sha512 = {
+ profile: busdox-transport-as2-ver1p0r1
+ sender: oxalis-as2
+ weight: 2000
+}
\ No newline at end of file
diff --git a/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/SimpleLoadTest.java b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/SimpleLoadTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..8d1f6a0f912ec7abe0b22ff60262f3a893ecc730
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/SimpleLoadTest.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.name.Names;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.api.outbound.MessageSender;
+import network.oxalis.api.outbound.TransmissionRequest;
+import network.oxalis.api.outbound.TransmissionResponse;
+import network.oxalis.as2.inbound.As2InboundModule;
+import network.oxalis.as2.outbound.As2OutboundModule;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import network.oxalis.test.jetty.AbstractJettyServerTest;
+import network.oxalis.vefa.peppol.common.model.Endpoint;
+import network.oxalis.vefa.peppol.common.model.Header;
+import network.oxalis.vefa.peppol.common.model.TransportProfile;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.io.InputStream;
+import java.net.URI;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+@Slf4j
+public class SimpleLoadTest extends AbstractJettyServerTest {
+
+ private static final int MESSAGES = 500;
+
+ @Override
+ public Injector getInjector() {
+ return Guice.createInjector(
+ new GuiceModuleLoader(),
+ new As2OutboundModule(),
+ new As2InboundModule()
+ );
+ }
+
+ @Test
+ public void simpleSha1() throws Exception {
+ MessageSender messageSender = injector.getInstance(Key.get(MessageSender.class, Names.named("oxalis-as2")));
+
+ TransmissionRequest transmissionRequest = new TransmissionRequest() {
+ @Override
+ public Endpoint getEndpoint() {
+ return Endpoint.of(TransportProfile.PEPPOL_AS2_1_0, URI.create("http://localhost:8080/as2"),
+ injector.getInstance(X509Certificate.class));
+ }
+
+ @Override
+ public Header getHeader() {
+ return Header.newInstance();
+ }
+
+ @Override
+ public InputStream getPayload() {
+ return getClass().getResourceAsStream("/as2-peppol-bis-invoice-sbdh.xml");
+ }
+ };
+
+ long ts = System.currentTimeMillis();
+ ExecutorService executorService = Executors.newFixedThreadPool(10);
+
+ List> futures = new ArrayList<>();
+ for (int i = 0; i < MESSAGES; i++)
+ futures.add(executorService.submit(() -> messageSender.send(transmissionRequest)));
+
+ for (Future future : futures)
+ future.get();
+
+ long result = System.currentTimeMillis() - ts;
+ log.info("Sent {} messages in {} ms.", MESSAGES, result);
+
+ Assert.assertTrue(result < 5 * 60 * 1000,
+ String.format("Sending %s messages took more than one minute.", MESSAGES));
+ }
+
+ @Test
+ public void simpleSha256() throws Exception {
+ MessageSender messageSender = injector.getInstance(Key.get(MessageSender.class, Names.named("oxalis-as2")));
+
+ TransmissionRequest transmissionRequest = new TransmissionRequest() {
+ @Override
+ public Endpoint getEndpoint() {
+ return Endpoint.of(TransportProfile.PEPPOL_AS2_2_0, URI.create("http://localhost:8080/as2"),
+ injector.getInstance(X509Certificate.class));
+ }
+
+ @Override
+ public Header getHeader() {
+ return Header.newInstance();
+ }
+
+ @Override
+ public InputStream getPayload() {
+ return getClass().getResourceAsStream("/as2-peppol-bis-invoice-sbdh.xml");
+ }
+ };
+
+ long ts = System.currentTimeMillis();
+ ExecutorService executorService = Executors.newFixedThreadPool(10);
+
+ List> futures = new ArrayList<>();
+ for (int i = 0; i < MESSAGES; i++)
+ futures.add(executorService.submit(() -> messageSender.send(transmissionRequest)));
+
+ for (Future future : futures)
+ future.get();
+
+ long result = System.currentTimeMillis() - ts;
+ log.info("Sent {} messages in {} ms.", MESSAGES, result);
+
+ Assert.assertTrue(result < 5 * 60 * 1000,
+ String.format("Sending %s messages took more than one minute.", MESSAGES));
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/SimpleServerTest.java b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/SimpleServerTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..2c7f3a3df3da44bd61a4d54fa1a268e66bed36dc
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/SimpleServerTest.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2;
+
+import com.google.common.io.ByteStreams;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.name.Names;
+import com.google.inject.util.Modules;
+import network.oxalis.api.outbound.MessageSender;
+import network.oxalis.api.outbound.TransmissionRequest;
+import network.oxalis.api.outbound.TransmissionResponse;
+import network.oxalis.api.persist.ReceiptPersister;
+import network.oxalis.as2.util.SMimeDigestMethod;
+import network.oxalis.as2.inbound.As2InboundModule;
+import network.oxalis.as2.outbound.As2OutboundModule;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import network.oxalis.commons.guice.OxalisModule;
+import network.oxalis.test.jetty.AbstractJettyServerTest;
+import network.oxalis.vefa.peppol.common.model.Endpoint;
+import network.oxalis.vefa.peppol.common.model.Header;
+import network.oxalis.vefa.peppol.common.model.TransportProfile;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URL;
+import java.security.cert.X509Certificate;
+
+public class SimpleServerTest extends AbstractJettyServerTest {
+
+ @Override
+ public Injector getInjector() {
+ return Guice.createInjector(
+ new As2OutboundModule(),
+ new As2InboundModule(),
+ Modules.override(new GuiceModuleLoader()).with(new OxalisModule() {
+ @Override
+ protected void configure() {
+ bind(ReceiptPersister.class).toInstance((m, p) -> {
+ /*
+ Assert.assertEquals(
+ m.getDigest().getValue(),
+ Base64.getDecoder().decode("WJ/tC+Ijr05qtT60fByQ8LQ4l9k=")
+ );
+ */
+ });
+ }
+ }));
+ }
+
+ @Test
+ public void simple() throws Exception {
+ MessageSender messageSender = injector.getInstance(Key.get(MessageSender.class, Names.named("oxalis-as2")));
+
+ TransmissionResponse transmissionResponse = messageSender.send(new TransmissionRequest() {
+ @Override
+ public Endpoint getEndpoint() {
+ return Endpoint.of(TransportProfile.PEPPOL_AS2_1_0, URI.create("http://localhost:8080/as2"),
+ injector.getInstance(X509Certificate.class));
+ }
+
+ @Override
+ public Header getHeader() {
+ return Header.newInstance();
+ }
+
+ @Override
+ public InputStream getPayload() {
+ return getClass().getResourceAsStream("/as2-peppol-bis-invoice-sbdh.xml");
+ }
+ });
+
+ Assert.assertNotNull(transmissionResponse);
+ }
+
+ @Test
+ public void simpleSha256() throws Exception {
+ MessageSender messageSender = injector.getInstance(Key.get(MessageSender.class, Names.named("oxalis-as2")));
+
+ TransmissionResponse transmissionResponse = messageSender.send(new TransmissionRequest() {
+ @Override
+ public Endpoint getEndpoint() {
+ return Endpoint.of(TransportProfile.PEPPOL_AS2_2_0, URI.create("http://localhost:8080/as2"),
+ injector.getInstance(X509Certificate.class));
+ }
+
+ @Override
+ public Header getHeader() {
+ return Header.newInstance();
+ }
+
+ @Override
+ public InputStream getPayload() {
+ return getClass().getResourceAsStream("/as2-peppol-bis-invoice-sbdh.xml");
+ }
+ });
+
+ Assert.assertNotNull(transmissionResponse);
+ }
+
+ @Test
+ public void simpleSha512() throws Exception {
+ MessageSender messageSender = injector.getInstance(Key.get(MessageSender.class, Names.named("oxalis-as2")));
+
+ TransmissionResponse transmissionResponse = messageSender.send(new TransmissionRequest() {
+ @Override
+ public Endpoint getEndpoint() {
+ return Endpoint.of(
+ SMimeDigestMethod.sha512.getTransportProfile(),
+ URI.create("http://localhost:8080/as2"),
+ injector.getInstance(X509Certificate.class));
+ }
+
+ @Override
+ public Header getHeader() {
+ return Header.newInstance();
+ }
+
+ @Override
+ public InputStream getPayload() {
+ return getClass().getResourceAsStream("/as2-peppol-bis-invoice-sbdh.xml");
+ }
+ });
+
+ Assert.assertNotNull(transmissionResponse);
+ }
+
+ @Test
+ public void simpleGet() throws Exception {
+ HttpURLConnection urlConnection = (HttpURLConnection) new URL("http://localhost:8080/as2").openConnection();
+
+ Assert.assertTrue(new String(ByteStreams.toByteArray(urlConnection.getInputStream()))
+ .contains("Hello AS2 world"));
+ Assert.assertEquals(urlConnection.getResponseCode(), HttpServletResponse.SC_OK);
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/code/As2HeaderTest.java b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/code/As2HeaderTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..44eb25d68ced76f5b64c74632bf97ee8162ebdfd
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/code/As2HeaderTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.code;
+
+import org.testng.annotations.Test;
+
+public class As2HeaderTest {
+
+ @Test
+ public void simpleConstructor() {
+ new As2Header();
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/code/DispositionModifierExtensionTest.java b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/code/DispositionModifierExtensionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..41240e21b5b72e731a25d964f2290ebd028cdb94
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/code/DispositionModifierExtensionTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.code;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+public class DispositionModifierExtensionTest {
+
+ @Test
+ public void simple() {
+ Assert.assertEquals(DispositionModifierExtension.of("authentication-failed"), DispositionModifierExtension.AUTHENTICATION_FAILED);
+ Assert.assertEquals(DispositionModifierExtension.valueOf("AUTHENTICATION_FAILED"), DispositionModifierExtension.AUTHENTICATION_FAILED);
+ }
+
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void triggerException() {
+ DispositionModifierExtension.of("invalid-code");
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/code/DispositionModifierTest.java b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/code/DispositionModifierTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..3e062938c89180b8c241273e0674a8e6b8e1052b
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/code/DispositionModifierTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.code;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+public class DispositionModifierTest {
+
+ @Test
+ public void simple() {
+ Assert.assertEquals(DispositionModifier.of("error"), DispositionModifier.ERROR);
+ Assert.assertEquals(DispositionModifier.valueOf("ERROR"), DispositionModifier.ERROR);
+ }
+
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void triggerException() {
+ DispositionModifier.of("info");
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/code/DispositionTest.java b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/code/DispositionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..1eadf14b759d7148bef4a717653ea039cdf63576
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/code/DispositionTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.code;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+public class DispositionTest {
+
+ /**
+ * RFC4130 7.5.6
+ */
+ @Test
+ public void backeardCompatibility() {
+ perform("automatic-action/MDN-sent-automatically; processed", DispositionType.PROCESSED, null, null);
+
+ perform("automatic-action/MDN-sent-automatically; processed/error: authentication-failed",
+ DispositionType.PROCESSED, DispositionModifier.ERROR,
+ DispositionModifierExtension.AUTHENTICATION_FAILED);
+
+ perform("automatic-action/MDN-sent-automatically;\n" +
+ " processed/error: authentication-failed",
+ DispositionType.PROCESSED, DispositionModifier.ERROR,
+ DispositionModifierExtension.AUTHENTICATION_FAILED);
+
+ perform("automatic-action/MDN-sent-automatically; processed/warning: duplicate-document",
+ DispositionType.PROCESSED, DispositionModifier.WARNING,
+ DispositionModifierExtension.DUPLICATE_DOCUMENT);
+
+ perform("automatic-action/MDN-sent-automatically;\n" +
+ " processed/warning: duplicate-document",
+ DispositionType.PROCESSED, DispositionModifier.WARNING,
+ DispositionModifierExtension.DUPLICATE_DOCUMENT);
+
+ perform("automatic-action/MDN-sent-automatically; failed/failure: sender-equals-receiver",
+ DispositionType.FAILED, DispositionModifier.FAILURE,
+ DispositionModifierExtension.SENDER_EQUALS_RECEIVER);
+
+ perform("automatic-action/MDN-sent-automatically;\n" +
+ " failed/failure: sender-equals-receiver",
+ DispositionType.FAILED, DispositionModifier.FAILURE,
+ DispositionModifierExtension.SENDER_EQUALS_RECEIVER);
+ }
+
+ private void perform(String value, DispositionType type, DispositionModifier modifier,
+ DispositionModifierExtension extension) {
+ Disposition disposition = Disposition.parse(value);
+
+ Assert.assertEquals(disposition.getType(), type);
+ Assert.assertEquals(disposition.getModifier(), modifier);
+ Assert.assertEquals(disposition.getExtension(), extension);
+ Assert.assertEquals(disposition.toString(), value.replaceAll("[ \r\n\t]+", " "));
+ }
+
+ @Test(expectedExceptions = IllegalStateException.class)
+ public void invalidValue() {
+ Disposition.parse("Hello World");
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/code/DispositionTypeTest.java b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/code/DispositionTypeTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..03493cc747bc38006072f119ddd299d5a1d9e4a1
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/code/DispositionTypeTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.code;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import static network.oxalis.as2.code.DispositionType.*;
+
+/**
+ * @author erlend
+ */
+public class DispositionTypeTest {
+
+ @Test
+ public void simple() {
+ Assert.assertEquals(of("processed"), PROCESSED);
+ Assert.assertEquals(valueOf("PROCESSED"), PROCESSED);
+ }
+
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void triggerException() {
+ of("handled");
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/code/MdnHeaderTest.java b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/code/MdnHeaderTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..b220d9ee3bceed9b2c3e177c3d11b23479d18b8e
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/code/MdnHeaderTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.code;
+
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+public class MdnHeaderTest {
+
+ @Test
+ public void simpleConstructor() {
+ new MdnHeader();
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/inbound/As2InboundHandlerTest.java b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/inbound/As2InboundHandlerTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..d53e7d87d0731db3a27da117aa802db1262098d6
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/inbound/As2InboundHandlerTest.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.inbound;
+
+import com.google.inject.Inject;
+import io.opentracing.Tracer;
+import network.oxalis.api.inbound.InboundService;
+import network.oxalis.api.lang.OxalisTransmissionException;
+import network.oxalis.api.model.Direction;
+import network.oxalis.api.timestamp.Timestamp;
+import network.oxalis.api.timestamp.TimestampProvider;
+import network.oxalis.as2.code.As2Header;
+import network.oxalis.as2.util.MimeMessageHelper;
+import network.oxalis.as2.util.SMimeDigestMethod;
+import network.oxalis.as2.util.SMimeMessageFactory;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import network.oxalis.commons.header.SbdhHeaderParser;
+import network.oxalis.commons.identifier.DefaultMessageIdGenerator;
+import network.oxalis.commons.mode.OxalisCertificateValidator;
+import network.oxalis.commons.persist.NoopPersister;
+import network.oxalis.commons.security.CertificateUtils;
+import network.oxalis.commons.tag.NoopTagGenerator;
+import network.oxalis.commons.transmission.DefaultTransmissionVerifier;
+import network.oxalis.vefa.peppol.security.api.CertificateValidator;
+import org.mockito.Mockito;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.InternetHeaders;
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMessage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
+import java.util.Date;
+
+import static org.testng.Assert.assertNotNull;
+
+/**
+ * Verifies that the As2InboundHandler works as expected.
+ *
+ * @author steinar
+ * Date: 08.12.2015
+ * Time: 15.21
+ */
+@Guice(modules = GuiceModuleLoader.class)
+public class As2InboundHandlerTest {
+
+ private InternetHeaders headers;
+
+ private TimestampProvider mockTimestampProvider;
+
+ @Inject
+ private X509Certificate certificate;
+
+ @Inject
+ private PrivateKey privateKey;
+
+ @Inject
+ private SMimeMessageFactory sMimeMessageFactory;
+
+ @Inject
+ private Tracer tracer;
+
+ @BeforeClass
+ public void setUp() throws Exception {
+ mockTimestampProvider = Mockito.mock(TimestampProvider.class);
+ Mockito.doReturn(new Timestamp(new Date(), null)).when(mockTimestampProvider)
+ .generate(Mockito.any(), Mockito.any(Direction.class));
+ Mockito.doReturn(new Timestamp(new Date(), null)).when(mockTimestampProvider)
+ .generate(Mockito.any(), Mockito.any(Direction.class), Mockito.any());
+
+ String ourCommonName = CertificateUtils.extractCommonName(certificate);
+
+ headers = new InternetHeaders();
+ headers.addHeader(As2Header.DISPOSITION_NOTIFICATION_OPTIONS, "Disposition-Notification-Options: signed-receipt-protocol=required, pkcs7-signature; signed-receipt-micalg=required,sha1");
+ headers.addHeader(As2Header.AS2_TO, ourCommonName);
+ headers.addHeader(As2Header.AS2_FROM, ourCommonName);
+ headers.addHeader(As2Header.MESSAGE_ID, "42");
+ headers.addHeader(As2Header.AS2_VERSION, As2Header.VERSION);
+ headers.addHeader(As2Header.SUBJECT, "An AS2 message");
+ headers.addHeader(As2Header.DATE, "Mon Oct 21 22:01:48 CEST 2013");
+
+ }
+
+ @Test(enabled = false)
+ public void testReceive() throws Exception {
+ InputStream inputStream = loadSampleMimeMessage();
+
+ As2InboundHandler as2InboundHandler = new As2InboundHandler(Mockito.mock(InboundService.class),
+ mockTimestampProvider, new OxalisCertificateValidator(CertificateValidator.EMPTY, tracer), new NoopPersister(),
+ new DefaultTransmissionVerifier(), sMimeMessageFactory, new NoopTagGenerator(),
+ new DefaultMessageIdGenerator("test"), new SbdhHeaderParser());
+
+ MimeMessage mimeMessage = MimeMessageHelper.parse(inputStream, headers);
+ as2InboundHandler.receive(headers, mimeMessage, tracer.buildSpan("test").start());
+ }
+
+
+ /**
+ * Creates a fake S/MIME message, to mimic the data being posted in an http POST request.
+ *
+ * @return
+ */
+ InputStream loadSampleMimeMessage() {
+
+ InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("sbdh-asic.xml");
+ assertNotNull(resourceAsStream);
+
+ try {
+ MimeBodyPart mimeBodyPart = MimeMessageHelper.createMimeBodyPart(resourceAsStream, "application/xml");
+
+ SMimeMessageFactory sMimeMessageFactory = new SMimeMessageFactory(privateKey, certificate);
+ MimeMessage signedMimeMessage = sMimeMessageFactory
+ .createSignedMimeMessage(mimeBodyPart, SMimeDigestMethod.sha1);
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ signedMimeMessage.writeTo(os);
+
+ return new ByteArrayInputStream(os.toByteArray());
+ } catch (MessagingException | IOException | OxalisTransmissionException e) {
+ throw new IllegalStateException(
+ "Unable to write S/MIME message to byte array outputstream " + e.getMessage(), e);
+ }
+ }
+}
+
diff --git a/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/mocking/InboundMockingModule.java b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/mocking/InboundMockingModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..3cb3de054b258a9c09cd56d3c0bb54531883cc8d
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/mocking/InboundMockingModule.java
@@ -0,0 +1,16 @@
+package network.oxalis.as2.mocking;
+
+import network.oxalis.api.inbound.InboundService;
+import network.oxalis.commons.guice.OxalisModule;
+import org.mockito.Mockito;
+
+/**
+ * @author erlend
+ */
+public class InboundMockingModule extends OxalisModule {
+
+ @Override
+ protected void configure() {
+ bind(InboundService.class).toInstance(Mockito.mock(InboundService.class));
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/model/As2DispositionNotificationOptionsTest.java b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/model/As2DispositionNotificationOptionsTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..400b86e8538aea755cab5dd706b63fbae4daf3be
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/model/As2DispositionNotificationOptionsTest.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.model;
+
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
+/**
+ * @author steinar
+ * Date: 17.10.13
+ * Time: 21:36
+ */
+public class As2DispositionNotificationOptionsTest {
+
+ @Test
+ public void createFromString() {
+
+ As2DispositionNotificationOptions options = As2DispositionNotificationOptions.valueOf("signed-receipt-protocol=required, pkcs7-signature; signed-receipt-micalg=required,sha1");
+ assertEquals(options.getParameters().size(), 2);
+
+ As2DispositionNotificationOptions.Parameter parameter = options.getSignedReceiptProtocol();
+ assertNotNull(parameter);
+
+ As2DispositionNotificationOptions.Parameter micAlg = options.getSignedReceiptMicalg();
+ assertNotNull(micAlg);
+
+ }
+
+ @Test
+ public void testFromRealMendelsonHeader() {
+
+ As2DispositionNotificationOptions options = As2DispositionNotificationOptions.valueOf("disposition-notification-options: signed-receipt-protocol=optional, pkcs7-signature; signed-receipt-micalg=optional, sha1, md5");
+ assertEquals(options.getParameters().size(), 2);
+
+ As2DispositionNotificationOptions.Parameter parameter = options.getSignedReceiptProtocol();
+ assertNotNull(parameter);
+
+ As2DispositionNotificationOptions.Parameter micAlg = options.getSignedReceiptMicalg();
+ assertNotNull(micAlg);
+
+ assertEquals(micAlg.getTextValue(), "sha1, md5");
+
+ assertEquals(options.getPreferredSignedReceiptMicAlgorithmName(), "sha1");
+
+ }
+
+ @Test
+ public void testSomeExamplesFromCipa() {
+
+ As2DispositionNotificationOptions o1 = As2DispositionNotificationOptions.valueOf("signed-receipt-protocol=optional, pkcs7-signature; signed-receipt-micalg=optional, sha1");
+ assertNotNull(o1.getSignedReceiptMicalg());
+ assertEquals(o1.getSignedReceiptMicalg().getTextValue(), "sha1");
+
+ As2DispositionNotificationOptions o2 = As2DispositionNotificationOptions.valueOf("signed-receipt-protocol=required, pkcs7-signature; signed-receipt-micalg=required, sha1");
+ assertNotNull(o2.getSignedReceiptMicalg());
+ assertEquals(o2.getSignedReceiptMicalg().getTextValue(), "sha1");
+
+ }
+
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void createFromInvalidString() {
+ As2DispositionNotificationOptions.valueOf("signed-receipt-protocol=reXXuired, pkcs7-signature");
+ }
+
+ @Test
+ public void testToString() {
+ As2DispositionNotificationOptions options = As2DispositionNotificationOptions.valueOf("signed-receipt-protocol=required, pkcs7-signature; signed-receipt-micalg=required,sha1");
+ assertEquals(options.toString(), "signed-receipt-protocol=required,pkcs7-signature; signed-receipt-micalg=required,sha1");
+
+ As2DispositionNotificationOptions opt2 = As2DispositionNotificationOptions.valueOf(options.toString());
+ assertNotNull(opt2);
+ assertEquals(opt2.getSignedReceiptMicalg().getImportance(), As2DispositionNotificationOptions.Importance.REQUIRED);
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/model/As2DispositionTest.java b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/model/As2DispositionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..70b4ad763d17f904355401697267a1603e06393b
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/model/As2DispositionTest.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.model;
+
+import org.testng.annotations.Test;
+
+import java.util.regex.Matcher;
+
+import static org.testng.Assert.*;
+
+/**
+ * @author steinar
+ * Date: 10.10.13
+ * Time: 18:50
+ */
+public class As2DispositionTest {
+
+ @Test
+ public void testToString() throws Exception {
+
+ String s = As2Disposition.processed().toString();
+ assertEquals(s, "automatic-action/MDN-sent-automatically; processed");
+
+ s = As2Disposition.failed("uhada").toString();
+ assertEquals(s.toLowerCase(), "automatic-action/mdn-sent-automatically; failed/failure: uhada");
+
+ s = As2Disposition.processedWithError("Ouch!").toString();
+ assertEquals(s.toLowerCase(), "automatic-action/mdn-sent-automatically; processed/error: ouch!");
+
+ }
+
+ @Test
+ public void parseWithPattern() throws Exception {
+ String s = "automatic-action/MDN-sent-automatically; processed/error: Unknown recipient";
+
+ Matcher matcher = As2Disposition.pattern.matcher(s);
+ assertTrue(matcher.matches());
+ assertEquals(matcher.groupCount(), 6);
+
+ String actionMode = matcher.group(1);
+ String sendingMode = matcher.group(2);
+ String dispositionType = matcher.group(3);
+ String dispositionModifierPrefix = matcher.group(5);
+ String dispositionModifier = matcher.group(6);
+
+ assertEquals(actionMode, "automatic-action");
+ assertEquals(sendingMode, "MDN-sent-automatically");
+ assertEquals(dispositionType, "processed");
+ assertEquals(dispositionModifierPrefix, "error");
+ assertEquals(dispositionModifier, "Unknown recipient");
+
+ s = "automatic-action/MDN-sent-automatically; processed";
+ matcher = As2Disposition.pattern.matcher(s);
+ assertTrue(matcher.matches());
+
+ assertEquals(matcher.toMatchResult().groupCount(), 6);
+
+ assertEquals(matcher.group(4), null);
+ }
+
+ @Test
+ public void parseWithValueOf() throws Exception {
+ String s = "automatic-action/MdN-sent-automatically; processed/error: Unknown recipient";
+ As2Disposition as2Disposition = As2Disposition.valueOf(s);
+ assertNotNull(as2Disposition);
+
+ assertEquals(as2Disposition.getActionMode(), As2Disposition.ActionMode.AUTOMATIC);
+ assertEquals(as2Disposition.getSendingMode(), As2Disposition.SendingMode.AUTOMATIC);
+ assertEquals(as2Disposition.getDispositionType(), As2Disposition.DispositionType.PROCESSED);
+ assertEquals(as2Disposition.getDispositionModifier().getPrefix(), As2Disposition.DispositionModifier.Prefix.ERROR);
+ assertEquals(as2Disposition.getDispositionModifier().getDispositionModifierExtension(), "Unknown recipient");
+ }
+
+ @Test
+ public void parseWithValueOfAdvanced() throws Exception {
+ String s = "automatic-action/MDN-sent-automatically; processed/ERROR: Payload does not contain Standard Business Document Header ";
+ As2Disposition as2Disposition = As2Disposition.valueOf(s);
+ assertNotNull(as2Disposition);
+ }
+
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void parseLongDispositionFromRealWorldTesting() {
+ String s = "automatic-action/MDN-sent-automatically; processed\\Error: unexpected-error";
+ As2Disposition.valueOf(s); // illegal syntax
+ }
+
+ @Test
+ public void parseLongDispositionFromRealWorldTestingFixed() {
+ String s = " automatic-action/MDN-sent-automatically; processed/Error: unexpected-error ";
+ As2Disposition unimaze = As2Disposition.valueOf(s);
+ assertEquals(unimaze.getDispositionModifier().getDispositionModifierExtension(), "unexpected-error");
+ }
+
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void parseShortDispositionFromRealWorldTesting() {
+ String s = "Disposition: \"disposition-mode\"; processed";
+ s = s.split("Disposition:")[1];
+ As2Disposition.valueOf(s); // illegal syntax
+ }
+
+}
diff --git a/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/model/MicTest.java b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/model/MicTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..b333906929a6ce34064bee8cfe1f4b6d1e26044b
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/model/MicTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.model;
+
+import network.oxalis.as2.util.SMimeDigestMethod;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertNotNull;
+
+/**
+ * @author steinar
+ * Date: 22.10.13
+ * Time: 16:01
+ */
+public class MicTest {
+ @Test
+ public void testToString() throws Exception {
+ Mic mic = new Mic("eeWNkOTx7yJYr2EW8CR85I7QJQY=", SMimeDigestMethod.sha1);
+ assertNotNull(mic);
+ }
+
+ @Test
+ public void testValueOf() throws Exception {
+
+ Mic mic = Mic.valueOf("eeWNkOTx7yJYr2EW8CR85I7QJQY=, sha1");
+ assertNotNull(mic);
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/util/MdnMimeMessageInspectorTest.java b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/util/MdnMimeMessageInspectorTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..3bd408035aeda7709cf248f45978da24b3e081af
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/util/MdnMimeMessageInspectorTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.util;
+
+import org.testng.annotations.Test;
+
+import javax.mail.internet.MimeMessage;
+import java.io.InputStream;
+import java.util.Map;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
+/**
+ * @author steinar
+ * Date: 13.11.13
+ * Time: 10:30
+ */
+public class MdnMimeMessageInspectorTest {
+
+ public static final String OPENAS2_MDN_TXT = "openas2-mdn.txt";
+
+ public static final String IBX_MDN_BASE64 = "real-mdn-examples/ibx-mdn-base64.txt";
+
+ @Test
+ public void parseOpenAS2MDN() throws Exception {
+
+ InputStream resourceAsStream = MdnMimeMessageInspectorTest.class.getClassLoader().getResourceAsStream(OPENAS2_MDN_TXT);
+ assertNotNull(resourceAsStream, "Unable to find " + OPENAS2_MDN_TXT + " in class path");
+
+ MimeMessage mimeMessage = MimeMessageHelper.parse(resourceAsStream);
+ MdnMimeMessageInspector mdnMimeMessageInspector = new MdnMimeMessageInspector(mimeMessage);
+ String plainText = mdnMimeMessageInspector.getPlainTextPartAsText();
+ assertNotNull(plainText);
+
+ }
+
+ @Test
+ public void parseOpenAS2MDNFields() throws Exception {
+
+ InputStream resourceAsStream = MdnMimeMessageInspectorTest.class.getClassLoader().getResourceAsStream(OPENAS2_MDN_TXT);
+ assertNotNull(resourceAsStream, "Unable to find " + OPENAS2_MDN_TXT + " in class path");
+
+ MimeMessage mimeMessage = MimeMessageHelper.parse(resourceAsStream);
+ MdnMimeMessageInspector mdnMimeMessageInspector = new MdnMimeMessageInspector(mimeMessage);
+ Map fields = mdnMimeMessageInspector.getMdnFields();
+ assertEquals(fields.get("Original-Recipient"), "rfc822; OpenAS2A");
+ assertEquals(fields.get("Final-Recipient"), "rfc822; OpenAS2A");
+ assertEquals(fields.get("Original-Message-ID"), "42");
+ assertEquals(fields.get("Received-Content-MIC"), "Fp67Ews9SJa5pKGXVl07dBuVW4I=, sha1");
+ }
+
+ @Test
+ public void parseBase64EncodedMDN() throws Exception {
+
+ InputStream resourceAsStream = MdnMimeMessageInspectorTest.class.getClassLoader().getResourceAsStream(IBX_MDN_BASE64);
+ assertNotNull(resourceAsStream, "Unable to find " + IBX_MDN_BASE64 + " in class path");
+
+ MimeMessage mimeMessage = MimeMessageHelper.parse(resourceAsStream);
+ MdnMimeMessageInspector mdnMimeMessageInspector = new MdnMimeMessageInspector(mimeMessage);
+ Map fields = mdnMimeMessageInspector.getMdnFields();
+ assertEquals(fields.size(), 6);
+ assertEquals(fields.get("Reporting-UA"), "Oxalis");
+ assertEquals(fields.get("Disposition"), "automatic-action/MDN-sent-automatically; processed");
+ assertEquals(fields.get("Original-Recipient"), "rfc822; APP_1000000030");
+ assertEquals(fields.get("Final-Recipient"), "rfc822; APP_1000000030");
+ assertEquals(fields.get("Original-Message-ID"), "19a9099c-c553-4ffa-9c60-de2fcfa2922f");
+ assertEquals(fields.get("Received-Content-MIC"), "VZOW8aRv9e8uEQEdGRdxwcOYH1g=, sha1");
+
+ }
+
+}
diff --git a/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/util/MessageIdUtilTest.java b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/util/MessageIdUtilTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..d9d7d3ef45cce8164d3dcaf6fcc544791dd264e9
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/util/MessageIdUtilTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2010-2017 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.util;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+public class MessageIdUtilTest {
+
+ @Test
+ public void simple() {
+ Assert.assertTrue(MessageIdUtil.verify("<1060501332.515.1528302064500@de77cf5d0088>"));
+ Assert.assertTrue(MessageIdUtil.verify(""));
+
+ Assert.assertFalse(MessageIdUtil.verify("<1060501332..515.1528302064500@de77cf5d0088>"));
+ Assert.assertFalse(MessageIdUtil.verify(" <1060501332.515.1528302064500@de77cf5d0088>"));
+ Assert.assertFalse(MessageIdUtil.verify("<1060501332.515.1528302064500@de77cf5d0088"));
+ Assert.assertFalse(MessageIdUtil.verify("<1060501332.515.1528302064500_de77cf5d0088>"));
+
+ Assert.assertTrue(MessageIdUtil.verify(""));
+ }
+
+}
diff --git a/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/util/MimeMessageHelperTest.java b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/util/MimeMessageHelperTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..b8b876347224ff1b0442a82db7659b50cfa09f57
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/util/MimeMessageHelperTest.java
@@ -0,0 +1,224 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.util;
+
+import network.oxalis.commons.bouncycastle.BCHelper;
+import org.bouncycastle.cert.X509CertificateHolder;
+import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
+import org.bouncycastle.cms.SignerInformation;
+import org.bouncycastle.cms.SignerInformationStore;
+import org.bouncycastle.cms.SignerInformationVerifier;
+import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.mail.smime.SMIMESigned;
+import org.bouncycastle.util.Store;
+import org.testng.annotations.Test;
+
+import javax.activation.MimeType;
+import javax.mail.BodyPart;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.Provider;
+import java.security.Security;
+import java.security.cert.X509Certificate;
+import java.util.Collection;
+import java.util.Iterator;
+
+import static org.testng.Assert.*;
+
+/**
+ * @author steinar
+ * @author thore
+ */
+public class MimeMessageHelperTest {
+
+ public static final String OPENAS2_MDN_TXT = "/openas2-mdn.txt";
+
+ public static final String OPENAS2_MDN_NO_HEADERS_TXT = "/openas2-mdn-no-headers.txt";
+
+ static {
+ BCHelper.registerProvider();
+ }
+
+ @Test
+ public void parseLegalMimeMessageWithHeaders() throws Exception {
+
+ InputStream resourceAsStream = getClass().getResourceAsStream(OPENAS2_MDN_TXT);
+ assertNotNull(resourceAsStream, OPENAS2_MDN_TXT + " not found in classpath");
+
+ MimeMessage mimeMessage = MimeMessageHelper.parse(resourceAsStream);
+ Object content = mimeMessage.getContent();
+ assertNotNull(content);
+ String contentType = mimeMessage.getContentType();
+ assertEquals(new MimeType(contentType).getBaseType(), new MimeType("multipart/signed").getBaseType());
+
+ MimeMultipart mimeMultipartSigned = (MimeMultipart) content;
+
+ // Two Bodies in the MimeMultiPart
+ assertEquals(mimeMultipartSigned.getCount(), 2);
+
+ // First body is a multipart/report
+ BodyPart firstBody = mimeMultipartSigned.getBodyPart(0);
+ assertEquals(new MimeType(firstBody.getContentType()).getBaseType(), new MimeType("multipart/report").getBaseType());
+
+ // Second body contains the signature
+ BodyPart secondBody = mimeMultipartSigned.getBodyPart(1);
+ assertEquals(new MimeType(secondBody.getContentType()).getBaseType(), new MimeType("application/pkcs7-signature").getBaseType());
+
+ // The inner multipart should contain two bodies: the text/plain and the message/disposition-notification
+ MimeMultipart innerMultiPart = (MimeMultipart) firstBody.getContent();
+ assertNotNull(innerMultiPart);
+ // Must have two parts
+ assertEquals(innerMultiPart.getCount(), 2);
+
+ // First part is text/plain
+ assertEquals(new MimeType(innerMultiPart.getBodyPart(0).getContentType()).getBaseType(), new MimeType("text/plain").getBaseType());
+
+ // Second part of first part in multipart is message/disposition-notification
+ assertEquals(new MimeType(innerMultiPart.getBodyPart(1).getContentType()).getBaseType(), new MimeType("message/disposition-notification").getBaseType());
+ }
+
+ @Test
+ public void verifyingSignatureOfRealMdn() {
+
+ boolean debug = false; // enable this to add certificate debugging
+
+ // first we validate some real positive MDN's from various systems
+ String[] mdnsToVerify = {"itsligo-mdn.txt", "unit4-mdn.txt", "unimaze-mdn.txt", "difi-negative-mdn.txt"};
+ for (String resourceName : mdnsToVerify) {
+ boolean verified = verify(resourceName, debug);
+ //System.out.println("Verification of " + resourceName + " returned status=" + verified);
+ assertTrue(verified, "Resource " + resourceName + " signature did not validate");
+ }
+
+ // then we validate some real negative MDN's from various systems
+ String[] mdnsNegative = {"unit4-mdn-negative.txt"};
+ for (String resourceName : mdnsNegative) {
+ boolean verified = verify(resourceName, debug);
+ assertTrue(verified, "Resource " + resourceName + " signature did not validated");
+ }
+
+ // then we validate some corrupt MDN's we have manually messed up
+ String[] mdnsToFail = {"unit4-mdn-error.txt"};
+ for (String resourceName : mdnsToFail) {
+ boolean failed = verify(resourceName, debug);
+ assertFalse(failed, "Resource " + resourceName + " signature should not have validated");
+ }
+
+ if (debug) {
+ // dump list of all providers registered
+ for (Provider p : Security.getProviders()) {
+ System.out.println("Provider : " + p.getName());
+ }
+ }
+
+ }
+
+ /**
+ * verify the signature (assuming the cert is contained in the message)
+ */
+ private boolean verify(String resourceName, boolean debug) {
+
+ System.out.println("Verifying resource " + resourceName + " (debug=" + debug + ")");
+ String resourcePath = "/real-mdn-examples/" + resourceName;
+
+ try {
+ // shortcuts lots of steps in the above test (parseLegalMimeMessageWithHeaders)
+ MimeMultipart multipartSigned = (MimeMultipart) MimeMessageHelper.parse(
+ getClass().getResourceAsStream(resourcePath)).getContent();
+ assertNotNull(multipartSigned);
+
+ // verify signature
+
+
+ SMIMESigned signedMessage = new SMIMESigned(multipartSigned);
+ Store certs = signedMessage.getCertificates();
+
+ SignerInformationStore signers = signedMessage.getSignerInfos();
+
+ for (Object signerInformation : signers.getSigners()) {
+ SignerInformation signer = (SignerInformation) signerInformation;
+ Collection certCollection = certs.getMatches(signer.getSID());
+
+ Iterator certIterator = certCollection.iterator();
+
+ X509Certificate cert = new JcaX509CertificateConverter().setProvider(BouncyCastleProvider.PROVIDER_NAME).getCertificate((X509CertificateHolder) certIterator.next());
+
+ if (debug) System.out.println("Signing certificate : " + cert);
+
+ SignerInformationVerifier signerInformationVerifier = new JcaSimpleSignerInfoVerifierBuilder().setProvider(BouncyCastleProvider.PROVIDER_NAME).build(cert);
+ if (signer.verify(signerInformationVerifier))
+ return true;
+
+ }
+
+ } catch (Exception ex) {
+ System.out.println("Verification failed with exception " + ex.getMessage());
+ }
+
+ return false;
+
+ }
+
+ /**
+ * Verifies that if you don't supply the headers, a plain/text message will be created even though it might appear as being a multipart.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void parseMimeMessageStreamWithoutContentTypeEmbedded() throws Exception {
+ InputStream resourceAsStream = getClass().getResourceAsStream(OPENAS2_MDN_NO_HEADERS_TXT);
+ assertNotNull(resourceAsStream, OPENAS2_MDN_NO_HEADERS_TXT + " not found in classpath");
+
+ MimeMessage mimeMessage = MimeMessageHelper.parse(resourceAsStream);
+ Object content = mimeMessage.getContent();
+ assertNotNull(content);
+ assertTrue(content instanceof String);
+ assertEquals(mimeMessage.getContentType(), "text/plain");
+ }
+
+
+ @Test
+ public void parseMimeMessageExperiment() throws IOException, MessagingException {
+
+ InputStream inputStream = getClass().getClassLoader().getResourceAsStream("mime-message.txt");
+ assertNotNull(inputStream, "mime-message.txt not found in class path");
+
+
+ MimeMessage mimeMessage = MimeMessageHelper.parse(inputStream);
+
+ Object content = mimeMessage.getContent();
+ assertTrue(content instanceof MimeMultipart);
+
+
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ mimeMessage.writeTo(os);
+
+ String s = new String(os.toByteArray());
+ assertFalse(s.contains("--null"));
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/util/SMimeBCTest.java b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/util/SMimeBCTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..4ae13727cd466e87243a864124ff017a553fd6e5
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/util/SMimeBCTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.util;
+
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+public class SMimeBCTest {
+
+ @Test
+ public void simpleConstructor() {
+ new SMimeBC();
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/util/SMimeMessageFactoryTest.java b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/util/SMimeMessageFactoryTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..1a6a57b5fee51548e43881741979408797a83c7d
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/java/network/oxalis/as2/util/SMimeMessageFactoryTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.as2.util;
+
+import com.google.inject.Inject;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import javax.activation.MimeType;
+import javax.mail.BodyPart;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
+
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+/**
+ * @author steinar
+ * Date: 08.10.13
+ * Time: 11:34
+ */
+@Guice(modules = GuiceModuleLoader.class)
+public class SMimeMessageFactoryTest {
+
+ private network.oxalis.as2.util.SMimeMessageFactory SMimeMessageFactory;
+
+ private InputStream resourceAsStream;
+
+ @Inject
+ private PrivateKey privateKey;
+
+ @Inject
+ private X509Certificate certificate;
+
+ @BeforeMethod
+ public void createMimeMessageFactory() {
+ SMimeMessageFactory = new SMimeMessageFactory(privateKey, certificate);
+
+ // Fetches input stream for data
+ resourceAsStream = SMimeMessageFactory.class.getClassLoader().getResourceAsStream("example.xml");
+ assertNotNull(resourceAsStream);
+
+ }
+
+ @Test
+ public void inspectSignedMessage() throws Exception {
+
+
+ // Creates the signed message
+ MimeMessage signedMimeMessage = SMimeMessageFactory
+ .createSignedMimeMessage(resourceAsStream, new MimeType("application", "xml"), SMimeDigestMethod.sha1);
+ assertNotNull(signedMimeMessage);
+
+ assertTrue(signedMimeMessage.getContent() instanceof MimeMultipart, "Not a MultiPart");
+
+ // Converts the contents into a Mime Multi Part, which should consist of two body parts
+ MimeMultipart mimeMultipart = (MimeMultipart) signedMimeMessage.getContent();
+
+ // First part contains the payload
+ BodyPart bodyPart = mimeMultipart.getBodyPart(0);
+ // For which the contents is an input stream giving access to the actual data
+ Object content = bodyPart.getContent();
+ assertTrue(content instanceof InputStream);
+
+ StringWriter sw = new StringWriter();
+ int c;
+ InputStream inputStream = bodyPart.getInputStream();
+ while ((c = inputStream.read()) >= 0) {
+ sw.write(c);
+ }
+
+ assertTrue(sw.toString().contains(" map = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+ map.put("NaMe", "value");
+ String value = map.get("name");
+ assertEquals(value, "value");
+ }
+}
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/as2-message/oxalis-sha1.txt b/oxalis-extension/oxalis-as2/src/test/resources/as2-message/oxalis-sha1.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b53c590255aa234b8113be2db224cb41fb108732
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/resources/as2-message/oxalis-sha1.txt
@@ -0,0 +1,196 @@
+Message-ID: <2027701910.2.1543119023808.JavaMail.erlend@lappy>
+MIME-Version: 1.0
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-1;
+ boundary="----=_Part_1_2021835850.1543119023806"
+
+------=_Part_1_2021835850.1543119023806
+Content-Type: application/xml
+Content-Transfer-Encoding: binary
+
+
+
+
+ 1.0
+
+ 0007:5567125082
+
+
+ 0007:4455454480
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2
+ 2.0
+ 1070e7f0-3bae-11e3-aa6e-0800200c9a66
+ Invoice
+ 2013-02-19T05:10:10
+
+
+
+ DOCUMENTID
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+
+
+ PROCESSID
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+
+
+
+
+ 2.0
+ urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ 1
+ 2012-06-08
+ 380
+ 2012-06-08
+ SEK
+ SOPE
+
+
+
+ 5567125082
+
+
+ Ecru Consulting
+
+
+ Gamla Brogatan
+ 29
+ Stockholm
+ 11120
+
+ SE
+
+
+
+ SE556712508201
+
+ VAT
+
+
+
+ 5567125082
+
+
+ Martin
+ Forsberg
+
+
+
+
+
+
+ 4455454480
+
+
+ EKONOMISTYRNINGSVERKET (NATIONAL FINANCIAL MANAGEMENT AUTHORITY)
+
+
+ 45316
+ EFFEKTIV ADMINISTRATION
+ STOCKHOLM
+ 104 30
+
+ SE
+
+
+
+ 2021005026
+
+
+ 08 - 123456
+ 08-123457
+ infomail@esv.se
+
+
+ SOREN
+ PEDERSEN
+
+
+
+
+ 31
+ 2012-06-23
+
+ 5955559
+
+
+ BGABSESS
+
+
+
+
+
+ 0.25
+
+ 1
+ 0.25
+
+ S
+ 25
+
+ VAT
+
+
+
+
+
+ 1
+ 1
+ 1.25
+ 1.25
+
+
+ 1
+ 1
+ 1
+
+ 1
+
+
+ TEST AV PEPPOL-FAKTURA
+
+
+ 1
+ 1
+
+
+
+
+
+------=_Part_1_2021835850.1543119023806
+Content-Type: application/pkcs7-signature; name=smime.p7s; smime-type=signed-data
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="smime.p7s"
+Content-Description: S/MIME Cryptographic Signature
+
+MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIAwggLrMIIB
+06ADAgECAgRYiPBmMA0GCSqGSIb3DQEBCwUAMC0xCzAJBgNVBAYTAk5PMR4wHAYDVQQDDBVEdW1t
+eSBBQ0NFU1MgUE9JTlQgQ0EwHhcNMTcwMTI1MTgzNzM0WhcNMjIwMTI1MTgzNzM0WjBCMQswCQYD
+VQQGEwJOTzEaMBgGA1UECgwRT3hhbGlzIFRlc3RpbmcgMDExFzAVBgNVBAMMDkFQUF8wMDAwMDAw
+MDAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsaZPCo0IZSKJQ5EiimL60HN5XjCa
+DBCge/qfM4wI5xLAag4UJi22pPKBYcq+hPd8b9gn98HFgrMkFfcZUJvjepMDt5vKbvILSUYr/rri
+CuOg2GUnckdfsAkiLhEBXjn3u5IcJhJ5FQu0brKWtUz/9sG2PFYaHD17bKE1RONBlkOgROoPDrPc
+TV5PeffP15rYmTh6/0vc2EHz6tFo3fj15FbkMi4xH88uMevD1dXjCuwrZQt1W83Qpa5Q9QRL5VrT
+CAz3JFWLDAsnf56LYlPAJhTQVPve+2z6sV5NDgCr9fdpUQaxt7FLt3L5yJsVFjD9m9Y8nCsbnVIP
+/HCZD3j5aQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCqoMl2ZH8pKBRZfVV46EEYPYPjRFWePRtg
+ABC2RA5rP2J5lDvoWd+P04ty+/wRcWFU9tMMv68i9nirTWRE14x5a215sUNwIhRlS7TA+32zSqdR
+/vrKopAnDNgdeSnpjSsEav+vAeSkukFPn5W8L2fJE3UN5VnfepVNwz2fYgJtuAmdKcQnC6YAJj/Z
+/V9cmxaR0YVi0RyzllBnjg3pUkCyUohlIs6mLbjyV0qNdHeE7JmHRNJeZn9Cgp+oC/WTyCYBbeCn
+KGqq85U6tRs2Qwxv7+FDJY2fEtArmhXTtQm3BhPGMWCmt5UkiZGl5fk9GNESidML10lQ2xf3njvY
+xIAfAAAxggHnMIIB4wIBATA1MC0xCzAJBgNVBAYTAk5PMR4wHAYDVQQDDBVEdW1teSBBQ0NFU1Mg
+UE9JTlQgQ0ECBFiI8GYwCQYFKw4DAhoFAKCBiDAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwG
+CSqGSIb3DQEJBTEPFw0xODExMjUwNDEwMjNaMCMGCSqGSIb3DQEJBDEWBBR7FXqoY/ZKfT1oQe+Q
+9m6S1vv06zApBgkqhkiG9w0BCTQxHDAaMAkGBSsOAwIaBQChDQYJKoZIhvcNAQEBBQAwDQYJKoZI
+hvcNAQEBBQAEggEAJtR/Tj2cRgErExRAur9vY8zgkTTmrvMi1ZoVX8/JgtnGq94JlnXiDNCAlgNg
+9Auwya8Q8efB6a5/r/vvyHGbcvKNFrDGYbU8gT27jnwvEWXOnzzI+n3c4B8JviM0oi+jWWYLgtOH
+ONYsrbYwXC2++b39KBb9JY64e20QdyOz/SYK6zXhExoo3V4Lfuy+8rk8kVW1eshhjn5Dm4FYuSb0
+Ej/I9uqyjzt6s94zUe4pfnxMCJQopGNY8SbKYwBJMNmftOS1L1y7tZykX33drFPKZCWvFCzpOo4f
+ReiU14kegGm/I+5KODWpj5xMUY/dwI76WYK44HfjGAvCpD81dYKLZQAAAAAAAA==
+------=_Part_1_2021835850.1543119023806--
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/as2-message/oxalis-sha512.txt b/oxalis-extension/oxalis-as2/src/test/resources/as2-message/oxalis-sha512.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7a485208d860818aa257b87cf2cac90ca48b7a30
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/resources/as2-message/oxalis-sha512.txt
@@ -0,0 +1,197 @@
+Message-ID: <726416425.9.1543118743284.JavaMail.erlend@lappy>
+MIME-Version: 1.0
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-512;
+ boundary="----=_Part_8_670951536.1543118743283"
+
+------=_Part_8_670951536.1543118743283
+Content-Type: application/xml
+Content-Transfer-Encoding: binary
+
+
+
+
+ 1.0
+
+ 0007:5567125082
+
+
+ 0007:4455454480
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2
+ 2.0
+ 1070e7f0-3bae-11e3-aa6e-0800200c9a66
+ Invoice
+ 2013-02-19T05:10:10
+
+
+
+ DOCUMENTID
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+
+
+ PROCESSID
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+
+
+
+
+ 2.0
+ urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ 1
+ 2012-06-08
+ 380
+ 2012-06-08
+ SEK
+ SOPE
+
+
+
+ 5567125082
+
+
+ Ecru Consulting
+
+
+ Gamla Brogatan
+ 29
+ Stockholm
+ 11120
+
+ SE
+
+
+
+ SE556712508201
+
+ VAT
+
+
+
+ 5567125082
+
+
+ Martin
+ Forsberg
+
+
+
+
+
+
+ 4455454480
+
+
+ EKONOMISTYRNINGSVERKET (NATIONAL FINANCIAL MANAGEMENT AUTHORITY)
+
+
+ 45316
+ EFFEKTIV ADMINISTRATION
+ STOCKHOLM
+ 104 30
+
+ SE
+
+
+
+ 2021005026
+
+
+ 08 - 123456
+ 08-123457
+ infomail@esv.se
+
+
+ SOREN
+ PEDERSEN
+
+
+
+
+ 31
+ 2012-06-23
+
+ 5955559
+
+
+ BGABSESS
+
+
+
+
+
+ 0.25
+
+ 1
+ 0.25
+
+ S
+ 25
+
+ VAT
+
+
+
+
+
+ 1
+ 1
+ 1.25
+ 1.25
+
+
+ 1
+ 1
+ 1
+
+ 1
+
+
+ TEST AV PEPPOL-FAKTURA
+
+
+ 1
+ 1
+
+
+
+
+
+------=_Part_8_670951536.1543118743283
+Content-Type: application/pkcs7-signature; name=smime.p7s; smime-type=signed-data
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="smime.p7s"
+Content-Description: S/MIME Cryptographic Signature
+
+MIAGCSqGSIb3DQEHAqCAMIACAQExDzANBglghkgBZQMEAgMFADCABgkqhkiG9w0BBwEAAKCAMIIC
+6zCCAdOgAwIBAgIEWIjwZjANBgkqhkiG9w0BAQsFADAtMQswCQYDVQQGEwJOTzEeMBwGA1UEAwwV
+RHVtbXkgQUNDRVNTIFBPSU5UIENBMB4XDTE3MDEyNTE4MzczNFoXDTIyMDEyNTE4MzczNFowQjEL
+MAkGA1UEBhMCTk8xGjAYBgNVBAoMEU94YWxpcyBUZXN0aW5nIDAxMRcwFQYDVQQDDA5BUFBfMDAw
+MDAwMDAwMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALGmTwqNCGUiiUORIopi+tBz
+eV4wmgwQoHv6nzOMCOcSwGoOFCYttqTygWHKvoT3fG/YJ/fBxYKzJBX3GVCb43qTA7ebym7yC0lG
+K/664grjoNhlJ3JHX7AJIi4RAV4597uSHCYSeRULtG6ylrVM//bBtjxWGhw9e2yhNUTjQZZDoETq
+Dw6z3E1eT3n3z9ea2Jk4ev9L3NhB8+rRaN349eRW5DIuMR/PLjHrw9XV4wrsK2ULdVvN0KWuUPUE
+S+Va0wgM9yRViwwLJ3+ei2JTwCYU0FT73vts+rFeTQ4Aq/X3aVEGsbexS7dy+cibFRYw/ZvWPJwr
+G51SD/xwmQ94+WkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAqqDJdmR/KSgUWX1VeOhBGD2D40RV
+nj0bYAAQtkQOaz9ieZQ76Fnfj9OLcvv8EXFhVPbTDL+vIvZ4q01kRNeMeWttebFDcCIUZUu0wPt9
+s0qnUf76yqKQJwzYHXkp6Y0rBGr/rwHkpLpBT5+VvC9nyRN1DeVZ33qVTcM9n2ICbbgJnSnEJwum
+ACY/2f1fXJsWkdGFYtEcs5ZQZ44N6VJAslKIZSLOpi248ldKjXR3hOyZh0TSXmZ/QoKfqAv1k8gm
+AW3gpyhqqvOVOrUbNkMMb+/hQyWNnxLQK5oV07UJtwYTxjFgpreVJImRpeX5PRjREonTC9dJUNsX
+95472MSAHwAAMYICGzCCAhcCAQEwNTAtMQswCQYDVQQGEwJOTzEeMBwGA1UEAwwVRHVtbXkgQUND
+RVNTIFBPSU5UIENBAgRYiPBmMA0GCWCGSAFlAwQCAwUAoIG4MBgGCSqGSIb3DQEJAzELBgkqhkiG
+9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTE4MTEyNTA0MDU0M1owLQYJKoZIhvcNAQk0MSAwHjANBglg
+hkgBZQMEAgMFAKENBgkqhkiG9w0BAQ0FADBPBgkqhkiG9w0BCQQxQgRA0MJCePem0dJ+vKvFjRIX
+mnIK2vFWgP6XBV1PhzF0DnuYF9Bgj2dic/W8A6Vt1Bz2IPhsZvj0No3Bto2WCBEItzANBgkqhkiG
+9w0BAQ0FAASCAQBMZIjNNTG1fYLs7NZSUmq6n4VromxcJowdHzgEDax8iw/PboBs5NAzoez33Baa
+5HZ/C0cDJTBxdLo1EIbZ9U5vum76WkEp+isnpUZzRb/VFLPUw4b6lQwDpFkP72Ea8KnK3O++Zvrf
+FAdaF9k2tsAFm/XH1OHmjdpcYL2MoRnYuepMDWGgHe8S+6Joa1q3dw6NWjdmxC/T5ElcxYkJfIVh
+DMaFwDWrbgYM7FSFX+/3UwPS9pDdlQ7j2RFLhidykO2I44ixnj5I8nK6tRNYo4Bcxqf/XyZC9OeU
+xVc6X8jjBwRmlvc/f+wjaDa5FtfDCkGf1XsJ3LWXNIpuDUdDnpnoAAAAAAAA
+------=_Part_8_670951536.1543118743283--
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/as2-message/some.txt b/oxalis-extension/oxalis-as2/src/test/resources/as2-message/some.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5bd7397e4950155e49c4ea6dc74eea3e83569d4b
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/resources/as2-message/some.txt
@@ -0,0 +1,58 @@
+MIME-Version: 1.0
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg="sha1"; boundary="----3932653C3BC75F1597D9A147B0D10AC0"
+
+This is an S/MIME signed message
+
+------3932653C3BC75F1597D9A147B0D10AC0
+Content-Type: application/EDI-X12
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=SI-UBL-INV-1.2-ok-minimal_with_business_header.xml
+
+PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPFN0YW5kYXJkQnVzaW5lc3NEb2N1bWVudCB4bWxucz0iaHR0cDovL3d3dy51bmVjZS5vcmcvY2VmYWN0L25hbWVzcGFjZXMvU3RhbmRhcmRCdXNpbmVzc0RvY3VtZW50SGVhZGVyIj4KICA8U3RhbmRhcmRCdXNpbmVzc0RvY3VtZW50SGVhZGVyPgogICAgICA8SGVhZGVyVmVyc2lvbj4xLjA8L0hlYWRlclZlcnNpb24+CiAgICAgIDxTZW5kZXI+CiAgICAgICAgICA8SWRlbnRpZmllciBBdXRob3JpdHk9ImlzbzY1MjMtYWN0b3JpZC11cGlzIj4wMTA2OnR0dGVzdHBheXQ8L0lkZW50aWZpZXI+CiAgICAgIDwvU2VuZGVyPgogICAgICA8UmVjZWl2ZXI+CiAgICAgICAgICA8SWRlbnRpZmllciBBdXRob3JpdHk9ImlzbzY1MjMtYWN0b3JpZC11cGlzIj4wMTA2OnR0dGVzdHBheXQ8L0lkZW50aWZpZXI+CiAgICAgIDwvUmVjZWl2ZXI+CiAgICAgIDxEb2N1bWVudElkZW50aWZpY2F0aW9uPgogICAgICAgICAgPFN0YW5kYXJkPnVybjpvYXNpczpuYW1lczpzcGVjaWZpY2F0aW9uOnVibDpzY2hlbWE6eHNkOkludm9pY2UtMjwvU3RhbmRhcmQ+CiAgICAgICAgICA8VHlwZVZlcnNpb24+Mi4wPC9UeXBlVmVyc2lvbj4KICAgICAgICAgIDxJbnN0YW5jZUlkZW50aWZpZXI+MTA3MGU3ZjAtM2JhZS0xMWUzLWFhNmUtMDgwMDIwMGM5YTY2PC9JbnN0YW5jZUlkZW50aWZpZXI+CiAgICAgICAgICA8VHlwZT5JbnZvaWNlPC9UeXBlPgogICAgICAgICAgPENyZWF0aW9uRGF0ZUFuZFRpbWU+MjAxMy0wMi0xOVQwNToxMDoxMDwvQ3JlYXRpb25EYXRlQW5kVGltZT4KICAgICAgPC9Eb2N1bWVudElkZW50aWZpY2F0aW9uPgogICAgICA8QnVzaW5lc3NTY29wZT4KICAgICAgICAgIDxTY29wZT4KICAgICAgICAgICAgICA8VHlwZT5ET0NVTUVOVElEPC9UeXBlPgogICAgICAgICAgICAgIDxJbnN0YW5jZUlkZW50aWZpZXI+dXJuOm9hc2lzOm5hbWVzOnNwZWNpZmljYXRpb246dWJsOnNjaGVtYTp4c2Q6SW52b2ljZS0yOjpJbnZvaWNlIyN1cm46d3d3LmNlbmJpaS5ldTp0cmFuc2FjdGlvbjpiaWl0cm5zMDEwOnZlcjIuMDpleHRlbmRlZDp1cm46d3d3LnBlcHBvbC5ldTpiaXM6cGVwcG9sNGE6dmVyMi4wOmV4dGVuZGVkOnVybjp3d3cuc2ltcGxlcmludm9pY2luZy5vcmc6c2k6c2ktdWJsOnZlcjEuMS54OjoyLjE8L0luc3RhbmNlSWRlbnRpZmllcj4KICAgICAgICAgIDwvU2NvcGU+CiAgICAgICAgICA8U2NvcGU+CiAgICAgICAgICAgICAgPFR5cGU+UFJPQ0VTU0lEPC9UeXBlPgogICAgICAgICAgICAgIDxJbnN0YW5jZUlkZW50aWZpZXI+dXJuOnd3dy5jZW5iaWkuZXU6cHJvZmlsZTpiaWkwNDp2ZXIxLjA8L0luc3RhbmNlSWRlbnRpZmllcj4KICAgICAgICAgIDwvU2NvcGU+CiAgICAgIDwvQnVzaW5lc3NTY29wZT4KICA8L1N0YW5kYXJkQnVzaW5lc3NEb2N1bWVudEhlYWRlcj4KICA8SW52b2ljZSB4bWxucz0idXJuOm9hc2lzOm5hbWVzOnNwZWNpZmljYXRpb246dWJsOnNjaGVtYTp4c2Q6SW52b2ljZS0yIiB4bWxuczpjYWM9InVybjpvYXNpczpuYW1lczpzcGVjaWZpY2F0aW9uOnVibDpzY2hlbWE6eHNkOkNvbW1vbkFnZ3JlZ2F0ZUNvbXBvbmVudHMtMiIgeG1sbnM6Y2JjPSJ1cm46b2FzaXM6bmFtZXM6c3BlY2lmaWNhdGlvbjp1Ymw6c2NoZW1hOnhzZDpDb21tb25CYXNpY0NvbXBvbmVudHMtMiIgeG1sbnM6eHNpPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIgeHNpOnNjaGVtYUxvY2F0aW9uPSJ1cm46b2FzaXM6bmFtZXM6c3BlY2lmaWNhdGlvbjp1Ymw6c2NoZW1hOnhzZDpJbnZvaWNlLTIKICAgIGh0dHA6Ly9kb2NzLm9hc2lzLW9wZW4ub3JnL3VibC9vcy1VQkwtMi4xL3hzZC9tYWluZG9jL1VCTC1JbnZvaWNlLTIuMS54c2QiPgogICAgPGNiYzpVQkxWZXJzaW9uSUQ+Mi4xPC9jYmM6VUJMVmVyc2lvbklEPgogICAgPGNiYzpDdXN0b21pemF0aW9uSUQ+dXJuOnd3dy5jZW5iaWkuZXU6dHJhbnNhY3Rpb246YmlpdHJuczAxMDp2ZXIyLjA6ZXh0ZW5kZWQ6dXJuOnd3dy5wZXBwb2wuZXU6YmlzOnBlcHBvbDRhOnZlcjIuMDpleHRlbmRlZDp1cm46d3d3LnNpbXBsZXJpbnZvaWNpbmcub3JnOnNpOnNpLXVibDp2ZXIxLjI8L2NiYzpDdXN0b21pemF0aW9uSUQ+CiAgICA8Y2JjOlByb2ZpbGVJRD51cm46d3d3LmNlbmJpaS5ldTpwcm9maWxlOmJpaTA0OnZlcjEuMDwvY2JjOlByb2ZpbGVJRD4KICAgIDxjYmM6SUQ+STIwMTMuMDMuNDM2MTwvY2JjOklEPgogICAgPGNiYzpJc3N1ZURhdGU+MjAxMy0wOC0wNjwvY2JjOklzc3VlRGF0ZT4KICAgIDxjYmM6SW52b2ljZVR5cGVDb2RlIGxpc3RJRD0iVU5DTDEwMDEiIGxpc3RBZ2VuY3lJRD0iNiI+MzgwPC9jYmM6SW52b2ljZVR5cGVDb2RlPgogICAgPGNiYzpEb2N1bWVudEN1cnJlbmN5Q29kZSBsaXN0SUQ9IklTTzQyMTciIGxpc3RBZ2VuY3lJRD0iNiI+RVVSPC9jYmM6RG9jdW1lbnRDdXJyZW5jeUNvZGU+CiAgICA8Y2FjOkFjY291bnRpbmdTdXBwbGllclBhcnR5PgogICAgICA8Y2FjOlBhcnR5PgogICAgICAgIDxjYWM6UGFydHlOYW1lPgogICAgICAgICAgPGNiYzpOYW1lPlNlbGxlciBCLlYuPC9jYmM6TmFtZT4KICAgICAgICA8L2NhYzpQYXJ0eU5hbWU+CiAgICAgICAgPGNhYzpQb3N0YWxBZGRyZXNzPgogICAgICAgICAgPGNiYzpTdHJlZXROYW1lPk1haW4gc3RyZWV0PC9jYmM6U3RyZWV0TmFtZT4KICAgICAgICAgIDxjYmM6Q2l0eU5hbWU+QmlnIGNpdHk8L2NiYzpDaXR5TmFtZT4KICAgICAgICAgIDxjYmM6UG9zdGFsWm9uZT41NDMyMTwvY2JjOlBvc3RhbFpvbmU+CiAgICAgICAgICA8Y2FjOkNvdW50cnk+CiAgICAgICAgICAgIDxjYmM6SWRlbnRpZmljYXRpb25Db2RlIGxpc3RBZ2VuY3lJRD0iNiIgbGlzdElEPSJJU08zMTY2LTE6QWxwaGEyIj5OTDwvY2JjOklkZW50aWZpY2F0aW9uQ29kZT4KICAgICAgICAgIDwvY2FjOkNvdW50cnk+CiAgICAgICAgPC9jYWM6UG9zdGFsQWRkcmVzcz4KICAgICAgICA8Y2FjOlBhcnR5TGVnYWxFbnRpdHk+CiAgICAgICAgICA8Y2JjOkNvbXBhbnlJRCBzY2hlbWVJRD0iTkw6VkFUIj4zMzMzMzMzMzMzPC9jYmM6Q29tcGFueUlEPgogICAgICAgIDwvY2FjOlBhcnR5TGVnYWxFbnRpdHk+CiAgICAgIDwvY2FjOlBhcnR5PgogICAgPC9jYWM6QWNjb3VudGluZ1N1cHBsaWVyUGFydHk+CiAgICA8Y2FjOkFjY291bnRpbmdDdXN0b21lclBhcnR5PgogICAgICA8Y2FjOlBhcnR5PgogICAgICAgIDxjYWM6UGFydHlOYW1lPgogICAgICAgICAgPGNiYzpOYW1lPkJ1eWVyY29tcGFueSBWT0Y8L2NiYzpOYW1lPgogICAgICAgIDwvY2FjOlBhcnR5TmFtZT4KICAgICAgICA8Y2FjOlBvc3RhbEFkZHJlc3M+CiAgICAgICAgICA8Y2JjOlN0cmVldE5hbWU+TWFpbiBzdHJlZXQ8L2NiYzpTdHJlZXROYW1lPgogICAgICAgICAgPGNiYzpDaXR5TmFtZT5CaWcgY2l0eTwvY2JjOkNpdHlOYW1lPgogICAgICAgICAgPGNiYzpQb3N0YWxab25lPjU0MzIxPC9jYmM6UG9zdGFsWm9uZT4KICAgICAgICAgIDxjYWM6Q291bnRyeT4KICAgICAgICAgICAgPGNiYzpJZGVudGlmaWNhdGlvbkNvZGUgbGlzdEFnZW5jeUlEPSI2IiBsaXN0SUQ9IklTTzMxNjYtMTpBbHBoYTIiPk5MPC9jYmM6SWRlbnRpZmljYXRpb25Db2RlPgogICAgICAgICAgPC9jYWM6Q291bnRyeT4KICAgICAgICA8L2NhYzpQb3N0YWxBZGRyZXNzPgogICAgICAgIDxjYWM6UGFydHlMZWdhbEVudGl0eT4KICAgICAgICAgIDxjYmM6Q29tcGFueUlEIHNjaGVtZUlEPSJOTDpWQVQiPjMzMzMzMzMzMzM8L2NiYzpDb21wYW55SUQ+CiAgICAgICAgPC9jYWM6UGFydHlMZWdhbEVudGl0eT4KICAgICAgPC9jYWM6UGFydHk+CiAgICA8L2NhYzpBY2NvdW50aW5nQ3VzdG9tZXJQYXJ0eT4KICAgIDxjYWM6TGVnYWxNb25ldGFyeVRvdGFsPgogICAgICA8Y2JjOkxpbmVFeHRlbnNpb25BbW91bnQgY3VycmVuY3lJRD0iRVVSIj4yMDA8L2NiYzpMaW5lRXh0ZW5zaW9uQW1vdW50PgogICAgICA8Y2JjOlRheEV4Y2x1c2l2ZUFtb3VudCBjdXJyZW5jeUlEPSJFVVIiPjIwMDwvY2JjOlRheEV4Y2x1c2l2ZUFtb3VudD4KICAgICAgPGNiYzpUYXhJbmNsdXNpdmVBbW91bnQgY3VycmVuY3lJRD0iRVVSIj4yMDA8L2NiYzpUYXhJbmNsdXNpdmVBbW91bnQ+CiAgICAgIDxjYmM6UGF5YWJsZUFtb3VudCBjdXJyZW5jeUlEPSJFVVIiPjIwMDwvY2JjOlBheWFibGVBbW91bnQ+CiAgICA8L2NhYzpMZWdhbE1vbmV0YXJ5VG90YWw+CiAgICA8Y2FjOkludm9pY2VMaW5lPgogICAgICA8Y2JjOklEPjE8L2NiYzpJRD4KICAgICAgPGNiYzpJbnZvaWNlZFF1YW50aXR5IHVuaXRDb2RlPSI1OSIgdW5pdENvZGVMaXN0SUQ9IlVORUNFUmVjMjAiPjE8L2NiYzpJbnZvaWNlZFF1YW50aXR5PgogICAgICA8Y2JjOkxpbmVFeHRlbnNpb25BbW91bnQgY3VycmVuY3lJRD0iRVVSIj4yMDA8L2NiYzpMaW5lRXh0ZW5zaW9uQW1vdW50PgogICAgICA8Y2FjOkl0ZW0+CiAgICAgICAgPGNiYzpOYW1lPkJpdGNvaW4gTWFzdGVyY2xhc3M8L2NiYzpOYW1lPgogICAgICA8L2NhYzpJdGVtPgogICAgICA8Y2FjOlByaWNlPgogICAgICAgIDxjYmM6UHJpY2VBbW91bnQgY3VycmVuY3lJRD0iRVVSIj4yMDA8L2NiYzpQcmljZUFtb3VudD4KICAgICAgPC9jYWM6UHJpY2U+CiAgICA8L2NhYzpJbnZvaWNlTGluZT4KICA8L0ludm9pY2U+CjwvU3RhbmRhcmRCdXNpbmVzc0RvY3VtZW50Pgo=
+
+------3932653C3BC75F1597D9A147B0D10AC0
+Content-Type: application/pkcs7-signature; name="smime.p7s"
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="smime.p7s"
+
+MIIHMgYJKoZIhvcNAQcCoIIHIzCCBx8CAQExCTAHBgUrDgMCGjALBgkqhkiG9w0B
+BwGgggRqMIIEZjCCA06gAwIBAgIQQNnrBxVw4uQUu6QaUH9huTANBgkqhkiG9w0B
+AQsFADB9MQswCQYDVQQGEwJESzEnMCUGA1UEChMeTkFUSU9OQUwgSVQgQU5EIFRF
+TEVDT00gQUdFTkNZMR8wHQYDVQQLExZGT1IgVEVTVCBQVVJQT1NFUyBPTkxZMSQw
+IgYDVQQDExtQRVBQT0wgQUNDRVNTIFBPSU5UIFRFU1QgQ0EwHhcNMTcwMjE2MDAw
+MDAwWhcNMTkwMjE2MjM1OTU5WjA4MQswCQYDVQQGEwJOTDEQMA4GA1UECgwHUGF5
+dCBCVjEXMBUGA1UEAwwOQVBQXzEwMDAwMDAzMDIwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCVbX9y/LE2SZMgSRhXI0m0oyqyOEZLGnzdVz//6gADbx5u
+6wJFDq5XLGXXP1wEtghC29u7Q9eHB9xHa4P7G+PlJG8wUT1LscJ3/4pUEyBXelgn
+9b0oMIcdE5rVnTfoHJK8AcXbQi6wxtjAAeeempBHRgpG3fObDANdl71/TrGaAnz+
+yOFFMoL3uFAEfbGzw/+AZ22PdiKqb+Xl4eDw6j8rZEyg4n/bbEs0B1Xj0OhrevPK
+rRqjKGVc1FCi1IQgc707FZSPi1R81TWlFf4cYHZItmb7JDsp41k1/XnWxS9MctiH
++du2/RT27KI4MQAf/rQ9k5XAtKSUNwCVF5Z2VmJbAgMBAAGjggElMIIBITAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIDuDB2BgNVHR8EbzBtMGugaaBnhmVodHRwOi8vcGls
+b3RvbnNpdGVjcmwudmVyaXNpZ24uY29tL0RpZ2l0YWxpc2VyaW5nc3N0eXJlbHNl
+blBpbG90T3BlblBFUFBPTEFDQ0VTU1BPSU5UQ0EvTGF0ZXN0Q1JMLmNybDAfBgNV
+HSMEGDAWgBT3losZTK7iViEAvob9ekesncoFdTAdBgNVHQ4EFgQU5AVdw1gHi9gE
+KiPYzxBv5CmbFzAwOgYIKwYBBQUHAQEELjAsMCoGCCsGAQUFBzABhh5odHRwOi8v
+cGlsb3Qtb2NzcC52ZXJpc2lnbi5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJ
+KoZIhvcNAQELBQADggEBADKetqlYySQntgjO3jb90CDdQ3TiAxGHiNU8gJ1sQLFY
+JIPY61n/JEyZJnlZxw1618HuA/TbgBMMAT6+atmkLSo81aCb4Ycb/6jIBgS5Xkyo
+oLfBZBo6m5+l8vHcC0gf1xJBfPMA0I3kN4xiPB9/g38ncjxqkW49NL4CwnhtHc0i
+Ais+W5gTERZZtoIRDSToz9dzoktrXxBHplrcPFp5VMgnf0+DCGTVniptPU7L5DqO
+s3Fd9qzYyi7ZpqgChJfd0jT9gDOBT3+iGmzxGuOMnxhFCNdnIDDYbX4xLdApGPTx
+dwlBBvU/Jb8vHWMGvXudKuWucNAt/sybUKl63TQw+DMxggKSMIICjgIBATCBkTB9
+MQswCQYDVQQGEwJESzEnMCUGA1UEChMeTkFUSU9OQUwgSVQgQU5EIFRFTEVDT00g
+QUdFTkNZMR8wHQYDVQQLExZGT1IgVEVTVCBQVVJQT1NFUyBPTkxZMSQwIgYDVQQD
+ExtQRVBQT0wgQUNDRVNTIFBPSU5UIFRFU1QgQ0ECEEDZ6wcVcOLkFLukGlB/Ybkw
+BwYFKw4DAhqggdgwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0B
+CQUxDxcNMTgxMDMwMTQyNjQyWjAjBgkqhkiG9w0BCQQxFgQUWbnRYDaKGsSScYqR
+GPv+OmMRUJoweQYJKoZIhvcNAQkPMWwwajALBglghkgBZQMEASowCwYJYIZIAWUD
+BAEWMAsGCWCGSAFlAwQBAjAKBggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYI
+KoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgwDQYJKoZIhvcNAQEB
+BQAEggEAD0gncL6ZuoujJYeee6ZzFa8HNvgv8UQWwN7R1dJ1UVh0/Zf80iqqHwN5
+AoJ6dxnOAeu8c9XNq2VbKZjOmia3/He9eoR7V9ifoKAj1TLwBchra1o2mpoPy8xA
+TZqqPwnxJYJjWm7IW+a3txZ8mlDigezvanrLXuqIdi8718rE7RQ/1sXj/aG5TJ0P
+lBQU8zywMojC6g9SlsXJn2QaB6Q+VKhfMBXFQ0GpDsMZUnKt3DStk2i9aZ4T99rl
+KSfohpqpQAGEne86KXZk2DnSAke1jB5KVmm9mUQZLq0WL0ZLaqg51G/h99zeXGhn
+ZF1+FMRpzofOmejvw94/kKYXAj9/8w==
+
+------3932653C3BC75F1597D9A147B0D10AC0--
\ No newline at end of file
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/as2-peppol-bis-invoice-sbdh.xml b/oxalis-extension/oxalis-as2/src/test/resources/as2-peppol-bis-invoice-sbdh.xml
new file mode 100644
index 0000000000000000000000000000000000000000..96ebf27d9af40ee9d15a908ffe6434b168292f6b
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/resources/as2-peppol-bis-invoice-sbdh.xml
@@ -0,0 +1,156 @@
+
+
+
+ 1.0
+
+ 0007:5567125082
+
+
+ 0007:4455454480
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2
+ 2.0
+ 1070e7f0-3bae-11e3-aa6e-0800200c9a66
+ Invoice
+ 2013-02-19T05:10:10
+
+
+
+ DOCUMENTID
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+
+
+ PROCESSID
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+
+
+
+
+ 2.0
+ urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ 1
+ 2012-06-08
+ 380
+ 2012-06-08
+ SEK
+ SOPE
+
+
+
+ 5567125082
+
+
+ Ecru Consulting
+
+
+ Gamla Brogatan
+ 29
+ Stockholm
+ 11120
+
+ SE
+
+
+
+ SE556712508201
+
+ VAT
+
+
+
+ 5567125082
+
+
+ Martin
+ Forsberg
+
+
+
+
+
+
+ 4455454480
+
+
+ EKONOMISTYRNINGSVERKET (NATIONAL FINANCIAL MANAGEMENT AUTHORITY)
+
+
+ 45316
+ EFFEKTIV ADMINISTRATION
+ STOCKHOLM
+ 104 30
+
+ SE
+
+
+
+ 2021005026
+
+
+ 08 - 123456
+ 08-123457
+ infomail@esv.se
+
+
+ SOREN
+ PEDERSEN
+
+
+
+
+ 31
+ 2012-06-23
+
+ 5955559
+
+
+ BGABSESS
+
+
+
+
+
+ 0.25
+
+ 1
+ 0.25
+
+ S
+ 25
+
+ VAT
+
+
+
+
+
+ 1
+ 1
+ 1.25
+ 1.25
+
+
+ 1
+ 1
+ 1
+
+ 1
+
+
+ TEST AV PEPPOL-FAKTURA
+
+
+ 1
+ 1
+
+
+
+
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/example.xml b/oxalis-extension/oxalis-as2/src/test/resources/example.xml
new file mode 100644
index 0000000000000000000000000000000000000000..896e8c0997766fe369f260fe7324dbfb75294ac2
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/resources/example.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ org.apache.commons
+ commons-parent
+ 12
+
+
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/logback.xml b/oxalis-extension/oxalis-as2/src/test/resources/logback.xml
new file mode 100644
index 0000000000000000000000000000000000000000..52855494d9d93f199730dd13569d2e17b5869d9d
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/resources/logback.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+ %d %X{message-id} %p [%c] %m %n
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/mime-message.txt b/oxalis-extension/oxalis-as2/src/test/resources/mime-message.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0bd3c8234d6944aad9413c8b7381e0bfcf0f755b
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/resources/mime-message.txt
@@ -0,0 +1,85 @@
+MIME-Version: 1.0
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-1; boundary="----=_Part_34_426016548.1445612302735"
+
+------=_Part_34_426016548.1445612302735
+Content-Type: multipart/report; report-type=disposition-notification;
+ boundary="----=_Part_32_1720556567.1445612302731"
+
+------=_Part_32_1720556567.1445612302731
+Content-Type: text/plain
+Content-Transfer-Encoding: 7bit
+
+The following headers were received:
+date: fr, 23 okt 2015 16:58:22 +0200
+message-id: 1ae02c7f-825c-4d15-bed6-84d3410b4654
+subject: AS2 message from OXALIS
+content-type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-1;
+host: test-aksesspunkt.difi.no
+x-real-ip: 109.247.18.12
+x-forwarded-for: 109.247.18.12
+x-forwarded-proto: https
+connection: close
+as2-from: APP_1000000111
+as2-to: APP_1000000005
+disposition-notification-to: not.in.use@difi.no
+disposition-notification-options: signed-receipt-protocol=required,pkcs7-signature; signed-receipt-micalg=required,sha1
+as2-version: 1.0
+user-agent: Apache-HttpClient/4.3.6 (java 1.5)
+accept-encoding: gzip,deflate
+content-length: 144689
+
+The message sent to AS2 System id APP_1000000111 on Fri, 23 Oct 2015 16:58:22 +0200 with subject AS2 MDN as you requested has been received.
+It has been processed successfully.
+
+------=_Part_32_1720556567.1445612302731
+Content-Type: message/disposition-notification
+Content-Transfer-Encoding: 7bit
+
+Reporting-UA: Oxalis
+Disposition: automatic-action/MDN-sent-automatically; processed
+Original-Recipient: rfc822; APP_1000000111
+Final-Recipient: rfc822; APP_1000000111
+Original-Message-ID: 1ae02c7f-825c-4d15-bed6-84d3410b4654
+Received-Content-MIC: qqgUdt1MSJQ5ppbv0YPk6H/VtIA=, sha1
+
+
+------=_Part_32_1720556567.1445612302731--
+
+------=_Part_34_426016548.1445612302735
+Content-Type: application/pkcs7-signature; name=smime.p7s; smime-type=signed-data
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="smime.p7s"
+Content-Description: S/MIME Cryptographic Signature
+
+MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIAwggRjMIID
+S6ADAgECAhB2xbtJl+hNi2GjbR7XK65dMA0GCSqGSIb3DQEBCwUAMH0xCzAJBgNVBAYTAkRLMScw
+JQYDVQQKEx5OQVRJT05BTCBJVCBBTkQgVEVMRUNPTSBBR0VOQ1kxHzAdBgNVBAsTFkZPUiBURVNU
+IFBVUlBPU0VTIE9OTFkxJDAiBgNVBAMTG1BFUFBPTCBBQ0NFU1MgUE9JTlQgVEVTVCBDQTAeFw0x
+NDExMzAwMDAwMDBaFw0xNjExMjkyMzU5NTlaMDUxCzAJBgNVBAYTAk5PMQ0wCwYDVQQKDARESUZJ
+MRcwFQYDVQQDDA5BUFBfMTAwMDAwMDAwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANYqy399Su4zoyw6wV6gfnvCnE/O+b299Ai7iO2aYbGslALHgN2JyLuA9ZuUXBKgmGOnaN57RyT8
+EUYZdr8UUwuHfQB92AVFJKuuLBXunjk/KrMwkzreWDa9vY5hFXi4NlGnt0IGB005ew8t5LIlQYWp
+sAQWFzDewM1OsXRaQPKwrBf8qI0NwKs5duGErB5rCvGno3hrK6kJuHN38wA6ptJpJODyPKws9Gzz
+QtEV8u3zyiIFwnFEFDNuR51T17dYWzRSfMR2RCfYRrpgrJcq0r8Ztp60GthsfawC1ihGeoQqWzV+
+wU2Jw8meaPB49zxH6E05dZRPAYbEm+4b3W4It1cCAwEAAaOCASUwggEhMAkGA1UdEwQCMAAwCwYD
+VR0PBAQDAgO4MHYGA1UdHwRvMG0wa6BpoGeGZWh0dHA6Ly9waWxvdG9uc2l0ZWNybC52ZXJpc2ln
+bi5jb20vRGlnaXRhbGlzZXJpbmdzc3R5cmVsc2VuUGlsb3RPcGVuUEVQUE9MQUNDRVNTUE9JTlRD
+QS9MYXRlc3RDUkwuY3JsMB8GA1UdIwQYMBaAFPeWixlMruJWIQC+hv16R6ydygV1MB0GA1UdDgQW
+BBRtzlYIF+xBLYqTOeWRTzcS0e9vszA6BggrBgEFBQcBAQQuMCwwKgYIKwYBBQUHMAGGHmh0dHA6
+Ly9waWxvdC1vY3NwLnZlcmlzaWduLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0B
+AQsFAAOCAQEAAfPOJJ56O90W5BB9hOwerxyo8HEdceYPvzccUiEQnQ8QFsjwgYayiWlbcN4rOa14
+rdKastg2gpGgaLduSUhGW6NNK3x/C8ysQUBtDijXj84Ve+nc0DqF44qHNTguqHcMYZbP9tVtmeX+
+cNDzKebgx4m/OqSx+zJeVOlZN/rg2A5nae1mr+J9tshKTmRGoqJfbML/RE174LB2P6polC/ATYzC
+Zq4YAGiUUf91ROMQJljbcejgJwhrU3O8CnblLbD2ufz8V8ER1ydWfNcCUERTdsIFx8babT4LLpjw
+Lk4jSYXzddr+xhLzoh76Nk9FzUv0tgiGEPeBTz/t9ncO8wUU+QAAMYICGDCCAhQCAQEwgZEwfTEL
+MAkGA1UEBhMCREsxJzAlBgNVBAoTHk5BVElPTkFMIElUIEFORCBURUxFQ09NIEFHRU5DWTEfMB0G
+A1UECxMWRk9SIFRFU1QgUFVSUE9TRVMgT05MWTEkMCIGA1UEAxMbUEVQUE9MIEFDQ0VTUyBQT0lO
+VCBURVNUIENBAhB2xbtJl+hNi2GjbR7XK65dMAkGBSsOAwIaBQCgXTAYBgkqhkiG9w0BCQMxCwYJ
+KoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0xNTEwMjMxNDU4MjJaMCMGCSqGSIb3DQEJBDEWBBQw
+HlmMXCY3GQgnBqhuZtEmobwZZjANBgkqhkiG9w0BAQEFAASCAQCJnHGWwbTNh1xym2W+8fTpv7r3
+f2EaIbzoRwwh3yttmfOFqFxN6HDBr4d+e8h72A6UHnByX/sKdbzFqUXE+HsLIMV1lClFD5027ENp
+VGmaV3zhmdT8Lp2kcuv9XZbq7Y26A81ht3CB3jBrXVjbpFMzdFdVcDB4YendDRDpccxERWtv8+im
+LMbbyjAE4DzfIuRhpIndrp7Jx8FgpQ601AZDfHTvYMPs+yHuHGkXd7uDXwALvf27o6lmaDOqxDZr
++XlmuPl83fdnycyBSQ4cNahPmA1dStIgTMWXuL5YtN9Y9VMIjWTeL77WfOi7RtMf1o/kFOxb3nS/
+UY0Srm3fNK9jAAAAAAAA
+------=_Part_34_426016548.1445612302735--
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/openas2-mdn-no-headers.txt b/oxalis-extension/oxalis-as2/src/test/resources/openas2-mdn-no-headers.txt
new file mode 100644
index 0000000000000000000000000000000000000000..438e3239f2f660637a3347beb27922d4f246884e
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/resources/openas2-mdn-no-headers.txt
@@ -0,0 +1,41 @@
+
+------=_Part_2_1193010873.1384331414156
+Content-Type: multipart/report; report-type=disposition-notification;
+ boundary="----=_Part_0_119619154.1384331414130"
+
+------=_Part_0_119619154.1384331414130
+Content-Type: text/plain
+Content-Transfer-Encoding: 7bit
+
+The message sent to Recipient OpenAS2A on Wed Nov 13 09:29:03 CET 2013 with Subject PEPPOL message has been received, the EDI Interchange was successfully decrypted and it's integrity was verified. In addition, the sender of the message, Sender OpenAS2B at Location /0:0:0:0:0:0:0:1%0 was authenticated as the originator of the message. There is no guarantee however that the EDI Interchange was syntactically correct, or was received by the EDI application/translator.
+
+------=_Part_0_119619154.1384331414130
+Content-Type: message/disposition-notification
+Content-Transfer-Encoding: 7bit
+
+Reporting-UA: ph-OpenAS2 v1.0@/0:0:0:0:0:0:0:1%0:10080
+Original-Recipient: rfc822; OpenAS2A
+Final-Recipient: rfc822; OpenAS2A
+Original-Message-ID: 42
+Disposition: automatic-action/MDN-sent-automatically; processed
+Received-Content-MIC: Fp67Ews9SJa5pKGXVl07dBuVW4I=, sha1
+
+
+------=_Part_0_119619154.1384331414130--
+
+------=_Part_2_1193010873.1384331414156
+Content-Type: application/pkcs7-signature; name=smime.p7s; smime-type=signed-data
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="smime.p7s"
+Content-Description: S/MIME Cryptographic Signature
+
+MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAMYIBrjCCAaoC
+AQEwKDAgMQswCQYDVQQGEwJBVDERMA8GA1UEAwwIT3BlbkFTMkECBFGKVcEwCQYFKw4DAhoFAKBd
+MBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTEzMTExMzA4MzAxNFow
+IwYJKoZIhvcNAQkEMRYEFAqdoZ4WPXKfehkAQk8I+1iqfJeGMA0GCSqGSIb3DQEBAQUABIIBAHu5
+1PU54BfUG6EPV81JtqoFF9u5bo3RSdFxCTXp4ui6w/Gp+WjelfiCWPD4i/6xHU0si8Xv36Saw0s2
+KZ9arUUtmTphdvP1Wr82sFxZgYLfdAR/1Qm3WMNAQtfZLJPBeLPsUXz4fxg+kPc4Tdha0sgJ9ciL
+vv8G/I8gl0NbIDLKaRVtLn3V8nWKl4Cbs2g8uC2gX821yNOvSJ9KwJXi7sC5QPMajKoE/vVyE/fV
+XxhOszP2Q7XuISinihXgJQss3kTUkSOstiQ7ESrRqUCr0ckV/P5NhvlJSPc53SzurCe+ms5sB6SP
+P1IhOarWg/8V6UHyQt0EXpcMQXEYWTC43EcAAAAAAAA=
+------=_Part_2_1193010873.1384331414156--
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/openas2-mdn.txt b/oxalis-extension/oxalis-as2/src/test/resources/openas2-mdn.txt
new file mode 100644
index 0000000000000000000000000000000000000000..74cb7af33363b796c3bdca53c2a39ca458b3dcdf
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/resources/openas2-mdn.txt
@@ -0,0 +1,54 @@
+Date: Wed, 13 Nov 2013 09:30:14 +0100
+From: OpenAS2 A email
+Message-ID:
+Subject: Your Requested MDN Response
+Mime-Version: 1.0
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1;
+ boundary="----=_Part_2_1193010873.1384331414156"
+AS2-To: OpenAS2B
+AS2-From: OpenAS2A
+AS2-Version: 1.1
+Server ph-OpenAS2 v1.0 is not blacklisted
+Server: ph-OpenAS2 v1.0
+Content-Length: 2169
+
+------=_Part_2_1193010873.1384331414156
+Content-Type: multipart/report; report-type=disposition-notification;
+ boundary="----=_Part_0_119619154.1384331414130"
+
+------=_Part_0_119619154.1384331414130
+Content-Type: text/plain
+Content-Transfer-Encoding: 7bit
+
+The message sent to Recipient OpenAS2A on Wed Nov 13 09:29:03 CET 2013 with Subject PEPPOL message has been received, the EDI Interchange was successfully decrypted and it's integrity was verified. In addition, the sender of the message, Sender OpenAS2B at Location /0:0:0:0:0:0:0:1%0 was authenticated as the originator of the message. There is no guarantee however that the EDI Interchange was syntactically correct, or was received by the EDI application/translator.
+
+------=_Part_0_119619154.1384331414130
+Content-Type: message/disposition-notification
+Content-Transfer-Encoding: 7bit
+
+Reporting-UA: ph-OpenAS2 v1.0@/0:0:0:0:0:0:0:1%0:10080
+Original-Recipient: rfc822; OpenAS2A
+Final-Recipient: rfc822; OpenAS2A
+Original-Message-ID: 42
+Disposition: automatic-action/MDN-sent-automatically; processed
+Received-Content-MIC: Fp67Ews9SJa5pKGXVl07dBuVW4I=, sha1
+
+
+------=_Part_0_119619154.1384331414130--
+
+------=_Part_2_1193010873.1384331414156
+Content-Type: application/pkcs7-signature; name=smime.p7s; smime-type=signed-data
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="smime.p7s"
+Content-Description: S/MIME Cryptographic Signature
+
+MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAMYIBrjCCAaoC
+AQEwKDAgMQswCQYDVQQGEwJBVDERMA8GA1UEAwwIT3BlbkFTMkECBFGKVcEwCQYFKw4DAhoFAKBd
+MBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTEzMTExMzA4MzAxNFow
+IwYJKoZIhvcNAQkEMRYEFAqdoZ4WPXKfehkAQk8I+1iqfJeGMA0GCSqGSIb3DQEBAQUABIIBAHu5
+1PU54BfUG6EPV81JtqoFF9u5bo3RSdFxCTXp4ui6w/Gp+WjelfiCWPD4i/6xHU0si8Xv36Saw0s2
+KZ9arUUtmTphdvP1Wr82sFxZgYLfdAR/1Qm3WMNAQtfZLJPBeLPsUXz4fxg+kPc4Tdha0sgJ9ciL
+vv8G/I8gl0NbIDLKaRVtLn3V8nWKl4Cbs2g8uC2gX821yNOvSJ9KwJXi7sC5QPMajKoE/vVyE/fV
+XxhOszP2Q7XuISinihXgJQss3kTUkSOstiQ7ESrRqUCr0ckV/P5NhvlJSPc53SzurCe+ms5sB6SP
+P1IhOarWg/8V6UHyQt0EXpcMQXEYWTC43EcAAAAAAAA=
+------=_Part_2_1193010873.1384331414156--
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/oxalis_home/fake-oxalis.conf b/oxalis-extension/oxalis-as2/src/test/resources/oxalis_home/fake-oxalis.conf
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/oxalis_home/logback-test.xml b/oxalis-extension/oxalis-as2/src/test/resources/oxalis_home/logback-test.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9ba0de5fc0e2ef9287cc084396a4efa80f319e31
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/resources/oxalis_home/logback-test.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+ %d %p [%c] %m %n
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/difi-negative-mdn.txt b/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/difi-negative-mdn.txt
new file mode 100644
index 0000000000000000000000000000000000000000..bb25134b23e96b409ab636a87a14a6562d6a331b
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/difi-negative-mdn.txt
@@ -0,0 +1,82 @@
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-1; boundary="----=_Part_2_2054159204.1399477056572"
+
+------=_Part_2_2054159204.1399477056572
+Content-Type: multipart/report; report-type=disposition-notification;
+ boundary="----=_Part_0_1911916813.1399477056487"
+
+------=_Part_0_1911916813.1399477056487
+Content-Type: text/plain
+Content-Transfer-Encoding: 7bit
+
+The following headers were received:
+date: Wed, 07 May 2014 17:37:33 +0200
+message-id: 6ced0160-bbb7-4294-a68a-fab7481da936
+subject: AS2 message from OXALIS
+content-type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-1;
+host: ver-aksesspunkt.difi.no
+x-real-ip: 195.1.61.90
+x-forwarded-for: 195.1.61.90
+x-forwarded-proto: https
+connection: close
+as2-from: APP_1000000006
+as2-to: APP_1000000009
+disposition-notification-to: not.in.use@unit4.com
+disposition-notification-options: signed-receipt-protocol=required,pkcs7-signature; signed-receipt-micalg=required,sha1
+as2-version: 1.2
+user-agent: Apache-HttpClient/4.3.1 (java 1.5)
+accept-encoding: gzip,deflate
+content-length: 144519
+
+The message sent to AS2 System id APP_1000000006 on Wed, 07 May 2014 17:37:36 +0200 with subject AS2 MDN as you requested has been received.It has been processed The warning/error message is:
+ERROR: Unable to create directory /var/lib/peppol/oxalis/inbound/0088_5013546205032/9908_810017902
+------=_Part_0_1911916813.1399477056487
+Content-Type: message/disposition-notification
+Content-Transfer-Encoding: 7bit
+
+Reporting-UA: Oxalis
+Disposition: automatic-action/MDN-sent-automatically; processed/ERROR: Unable to create directory /var/lib/peppol/oxalis/inbound/0088_5013546205032/9908_810017902
+Original-Recipient: rfc822; APP_1000000006
+Final-Recipient: rfc822; APP_1000000006
+Original-Message-ID: 6ced0160-bbb7-4294-a68a-fab7481da936
+Received-Content-MIC: ,
+
+------=_Part_0_1911916813.1399477056487--
+
+------=_Part_2_2054159204.1399477056572
+Content-Type: application/pkcs7-signature; name=smime.p7s; smime-type=signed-data
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="smime.p7s"
+Content-Description: S/MIME Cryptographic Signature
+
+MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIAwggRYMIID
+QKADAgECAhBOdXzXUvPVSzefNlAMZvGvMA0GCSqGSIb3DQEBCwUAMFcxCzAJBgNVBAYTAkRLMScw
+JQYDVQQKEx5OQVRJT05BTCBJVCBBTkQgVEVMRUNPTSBBR0VOQ1kxHzAdBgNVBAMTFlBFUFBPTCBB
+Q0NFU1MgUE9JTlQgQ0EwHhcNMTMwNzE1MDAwMDAwWhcNMTUwNzE1MjM1OTU5WjBdMQswCQYDVQQG
+EwJOTzEXMBUGA1UEAwwOQVBQXzEwMDAwMDAwMDcxNTAzBgNVBAoMLEFnZW5jeSBmb3IgUHVibGlj
+IE1hbmFnZW1lbnQgYW5kIGVHb3Zlcm5tZW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAwm80EA6SoFfkeESatW9jSwG5tzcdok4SIP5nvj7TUrLvOWPXSH7QESeWB2vyL/hGyEtKsG7S
+TS3mBEnTCyedefrQyccFCq+gw5vxFqEt7FmYi4mZkItuaYagnamx5KjIezmQnVZOrQJObFc0o9Xj
+eg8fCu0spPyTI2wFBba2G1jxiO7dacS56Eyzvudy07S2eufMs8CV74hHmkK/ZbnWDfaCRFQ9UftD
+o6vENHZ4cuhECBsd0sHeGyVcABtuqHMCdz5TeciIk2Ppa+JkehV6bYqfyrC4vy6YK12rBaZ0dGOJ
++bnwE7o4apevqg+hN3BOd2NC8pvGTjHvg9BjRCYoLQIDAQABo4IBGDCCARQwCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCA7gwbAYDVR0fBGUwYzBhoF+gXYZbaHR0cDovL29uc2l0ZWNybC52ZXJpc2lnbi5j
+b20vRGlnaXRhbGlzZXJpbmdzc3R5cmVsc2VuT3BlblBFUFBPTEFDQ0VTU1BPSU5UQ0EvTGF0ZXN0
+Q1JMLmNybDAfBgNVHSMEGDAWgBRN9j4AUCiGbTWg/O9mqvoioSTbjTAdBgNVHQ4EFgQU1WkX8tTt
+mDjwQIVVAf6nfZ2LfmowNwYIKwYBBQUHAQEEKzApMCcGCCsGAQUFBzABhhtodHRwOi8vcGtpLW9j
+c3Auc3ltYXV0aC5jb20wEwYDVR0lBAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEBAH0k
+dItdmxsoq1i5SsJ0oaUjJwh6yNmm4/Zc/vIKhLX2v6i3ISQGvAK608CO6wLRuLv3c8T6+NLOMT5l
+qv6gcvTU8L50eF7uOyRGuVfl6o4/+nrM8bQCdbQq6zQgtGn+88yzLo+4m9VzH/WO8OZ6mT63CcyI
+H+8UjCDhhoXMM8bY8EVaJkbvX3kL1WDW2fGbzeXUF7RR+0fAJnIHrJkPeKuxDqMUjXd19gpte4Rj
+Ihkhmj669Ya/mDnRQfO0pvt4DltM7w/OLXrwBngvVM1RNjzHrfi7OYqBdA5tgNWQJN5dFP85rSo2
+8EunYw5b1uVj61GlrZ5L30eJdnbwsdHvKKgAADGCAfEwggHtAgEBMGswVzELMAkGA1UEBhMCREsx
+JzAlBgNVBAoTHk5BVElPTkFMIElUIEFORCBURUxFQ09NIEFHRU5DWTEfMB0GA1UEAxMWUEVQUE9M
+IEFDQ0VTUyBQT0lOVCBDQQIQTnV811Lz1Us3nzZQDGbxrzAJBgUrDgMCGgUAoF0wGAYJKoZIhvcN
+AQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMTQwNTA3MTUzNzM2WjAjBgkqhkiG9w0B
+CQQxFgQUuOQPHHsfo4ZpGmUlBg8488gpnI4wDQYJKoZIhvcNAQEBBQAEggEAZJrJ6zi0url93ao8
+4/7mt63US3e5K5npLTZA6FZjhMTGKNqyPI1rRCq7UDZPrisJBrJhyKgYjgdmzj88r4ANEu0D40A4
+oYnNx7HBuBvXKpjwotsIGkPMmgnkteN7vK3F4MzSzY3w1atm1NwtnCRvpqqTggrTUbNhWQYXVs4l
+O7LVY+/xWaTjjsWfNKAqAroAWw66Iwix0FFIQVZ5Vo2Dy9+spLP/RoeehBTzMLMzOUbZfrE6uVDx
+mbqPX3yc28yS6EYHF23I3mo129b0fTs4bBof/RfTVrXgzM5/weoRWQ1YdjgeDE1WVlChwTOMatQY
+kIrbecVQ3twAQu3BEV3DxQAAAAAAAA==
+------=_Part_2_2054159204.1399477056572--
+
\ No newline at end of file
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/ibx-mdn-base64.txt b/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/ibx-mdn-base64.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a49acca23f25bb30b1c28139f0c6c61514018124
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/ibx-mdn-base64.txt
@@ -0,0 +1,77 @@
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-1; boundary="----=_Part_9916_110858470.1409652908446"
+
+------=_Part_9916_110858470.1409652908446
+Content-Type: multipart/report; report-type=disposition-notification;
+ boundary="----=_Part_9915_55548288.1409652908446"
+
+------=_Part_9915_55548288.1409652908446
+Content-Type: text/plain
+Content-Transfer-Encoding: 7bit
+
+The following headers were received:
+Date: ti, 02 sep 2014 12:15:00 +0200
+Message-Id: 19a9099c-c553-4ffa-9c60-de2fcfa2922f
+Subject: AS2 message from OXALIS
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-1; boundary="----=_Part_1_25794584.1409652900611"
+Content-Length: 343334
+as2-from: APP_1000000030
+as2-to: APP_1000000014
+disposition-notification-to: not.in.use@unit4.com
+disposition-notification-options: signed-receipt-protocol=required,pkcs7-signature; signed-receipt-micalg=required,sha1
+as2-version: 1.0
+host: peppolap.ibxplatform.net
+connection: Keep-Alive
+user-agent: Apache-HttpClient/4.3.1 (java 1.5)
+accept-encoding: gzip,deflate
+x-forwarded-proto: SSL
+x-forwarded-for: 134.47.109.184
+The message sent to AS2 System id APP_1000000030 on Tue, 02 Sep 2014 10:15:08 +0000 with subject AS2 MDN as you requested has been received.
+It has been processed successfully.
+------=_Part_9915_55548288.1409652908446
+Content-Type: message/disposition-notification
+Content-Transfer-Encoding: base64
+
+UmVwb3J0aW5nLVVBOiBPeGFsaXMNCkRpc3Bvc2l0aW9uOiBhdXRvbWF0aWMtYWN0aW9uL01ETi1z
+ZW50LWF1dG9tYXRpY2FsbHk7IHByb2Nlc3NlZA0KT3JpZ2luYWwtUmVjaXBpZW50OiByZmM4MjI7
+IEFQUF8xMDAwMDAwMDMwDQpGaW5hbC1SZWNpcGllbnQ6IHJmYzgyMjsgQVBQXzEwMDAwMDAwMzAN
+Ck9yaWdpbmFsLU1lc3NhZ2UtSUQ6IDE5YTkwOTljLWM1NTMtNGZmYS05YzYwLWRlMmZjZmEyOTIy
+Zg0KUmVjZWl2ZWQtQ29udGVudC1NSUM6IFZaT1c4YVJ2OWU4dUVRRWRHUmR4d2NPWUgxZz0sIHNo
+YTENCg0K
+------=_Part_9915_55548288.1409652908446--
+
+------=_Part_9916_110858470.1409652908446
+Content-Type: application/pkcs7-signature; name=smime.p7s; smime-type=signed-data
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="smime.p7s"
+Content-Description: S/MIME Cryptographic Signature
+
+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
+------=_Part_9916_110858470.1409652908446--
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/itsligo-mdn.txt b/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/itsligo-mdn.txt
new file mode 100644
index 0000000000000000000000000000000000000000..dd97533d2c77bd2ea167625e2affc3f75cdcf1e3
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/itsligo-mdn.txt
@@ -0,0 +1,42 @@
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="boundarykmWBAw=="
+
+--boundarykmWBAw==
+Content-Type: multipart/report; Report-Type=disposition-notification; boundary="----=MDN_boundary_ffb81710-0c1e-4b95-a097-57252ea0aea0"
+
+------=MDN_boundary_ffb81710-0c1e-4b95-a097-57252ea0aea0
+Content-Type: text/plain
+Content-Transfer-Encoding: 7bit
+
+MDN for -
+Message-ID: ebbfc406-6388-4f44-86bc-9d66844ad92c@CourierWeb
+Subject: MDN
+Date: Tue, 06 May 2014 13:01:20 GMT
+From: peppol-APP_1000000009
+To: APP_1000000006
+Received On: Tue, 06 May 2014 13:01:20 GMT
+Status: Disposition: automatic-action/MDN-sent-automatically; processed
+Comment: This is not a guarantee that the message has been completely processed or understood by the receiving translator
+
+
+------=MDN_boundary_ffb81710-0c1e-4b95-a097-57252ea0aea0
+Content-Type: message/disposition-notification
+Content-Transfer-Encoding: 7bit
+
+Reporting-UA: Omni ; Courier
+Original-Recipient: rfc822;peppol-APP_1000000009
+Final-Recipient: rfc822;peppol-APP_1000000009
+Original-Message-ID: 6229515e-28af-4d90-9587-f4f6f952ccf5
+Received-Content-MIC: rcg7GeeTSRscbqD9i0bNnzLlkvw=, sha1
+Disposition: automatic-action/MDN-sent-automatically; processed
+
+------=MDN_boundary_ffb81710-0c1e-4b95-a097-57252ea0aea0--
+
+--boundarykmWBAw==
+Content-Type: application/pkcs7-signature; name="smime.p7s"
+Content-Disposition: attachment; filename="smime.p7s"
+Content-Transfer-Encoding: base64
+
+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
+
+--boundarykmWBAw==--
+
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/unimaze-mdn.txt b/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/unimaze-mdn.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d385f944f00abb640b2e65a84797838a7c501958
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/unimaze-mdn.txt
@@ -0,0 +1,79 @@
+Content-Type: multipart/signed; boundary="------_=_NextPart_001_071EE00D.7087D242"; micalg="sha-1"; protocol="application/pkcs7-signature"
+
+--------_=_NextPart_001_071EE00D.7087D242
+Content-Type: multipart/report;
+ boundary="------_=_NextPart_001_E57B66E8.6B77E4C3"
+
+--------_=_NextPart_001_E57B66E8.6B77E4C3
+Content-Type: text/plain;
+ charset="us-ascii"
+
+MDN for -
+ Message-Id: 477b2b62-675d-4122-8e59-b24626d4c375
+ AS2-From: APP_1000000006
+ AS2-To: SMP_2000000005
+ Date: Tue, 06 May 2014 18:55:37 +0200
+ Subject: AS2 message from OXALIS
+
+The message has been received. It has been processed successfully.
+
+--------_=_NextPart_001_E57B66E8.6B77E4C3
+Content-Type: message/disposition-notification
+
+Reporting-UA: AS2 eefacta Server (unimaze.com)
+Original-Recipient: rfc822; SMP_2000000005
+Final-Recipient: rfc822; SMP_2000000005
+Original-Message-ID: 477b2b62-675d-4122-8e59-b24626d4c375
+Received-Content-MIC: 10g8Xg9swwOlTqAqjXpwpEhW1LQ=, sha1
+Disposition: automatic-action/MDN-sent-automatically; processed
+
+
+--------_=_NextPart_001_E57B66E8.6B77E4C3
+Content-Type: text/plain
+
+
+--------_=_NextPart_001_E57B66E8.6B77E4C3--
+
+--------_=_NextPart_001_071EE00D.7087D242
+Content-Type: application/pkcs7-signature;
+ name="smime.7ps";
+ smime-type="signed-data"
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment;
+ filename="smime.7ps"
+
+MIAGCSqGSIb3DQEHAqCAMIACAQExgDAJBgUrDgMCGgUAAAAwgAYJKoZIhvcNAQcBAACggDCCBDww
+ggMkoAMCAQICEDo9Q6Uo26Ro7phICY6e0K0wDQYJKoZIhvcNAQELBQAwVzELMAkGA1UEBhMCREsx
+JzAlBgNVBAoTHk5BVElPTkFMIElUIEFORCBURUxFQ09NIEFHRU5DWTEfMB0GA1UEAxMWUEVQUE9M
+IEFDQ0VTUyBQT0lOVCBDQTAeFw0xMzExMDQwMDAwMDBaFw0xNTExMDQyMzU5NTlaMEExCzAJBgNV
+BAYTAklTMRcwFQYDVQQDDA5BUFBfMTAwMDAwMDA1MzEZMBcGA1UECgwQVW5pbWF6ZSBTb2Z0d2Fy
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANU/u4z2ykLWduxqdpNCIs3/9huTlYoM
+GJonlAdVaQkvyX4g0BIJ7Puj/mRbe+X4PuphkKu5xgZiTCeHbsH0koCcNy/OwEFhe48v3cne3j5R
+OF+np5y4Z5CsKb3g4yposDFVBg9+tKvZVvZ3EQfcd1XgUj+Mcgk9zIwpdAqRvu03RZnL1D0knTNh
+y7ifNSdGjsVtaTHU1Ck7MMPxgkmXXxWvz5hQbwgjeI4n51lGC1vcVc5lfyG09eXUBJ/4cjGnp2xC
+dCLQN33UlDB37mbFQEF+POlI/oixpI9mGH883b3BJ9GTyHT9exmBJTOg7u1xoN70J7+DnejPiQOD
+yOifHe0CAwEAAaOCARgwggEUMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgO4MGwGA1UdHwRlMGMwYaBf
+oF2GW2h0dHA6Ly9vbnNpdGVjcmwudmVyaXNpZ24uY29tL0RpZ2l0YWxpc2VyaW5nc3N0eXJlbHNl
+bk9wZW5QRVBQT0xBQ0NFU1NQT0lOVENBL0xhdGVzdENSTC5jcmwwHwYDVR0jBBgwFoAUTfY+AFAo
+hm01oPzvZqr6IqEk240wHQYDVR0OBBYEFFJv1siJv5dBzRURgvU4/3zB4ATyMDcGCCsGAQUFBwEB
+BCswKTAnBggrBgEFBQcwAYYbaHR0cDovL3BraS1vY3NwLnN5bWF1dGguY29tMBMGA1UdJQQMMAoG
+CCsGAQUFBwMCMA0GCSqGSIb3DQEBCwUAA4IBAQAvQx+oB/Lr6r+TXaWL7a8rRkZugdB6JVvcl41U
+MHTnXgU/KukHjiC3HF0DwQ9NRD9tsvhivZYii6FIZJOUYRnXH4UrrvYsV9TApOUi74NCCFAaAnnp
+QUQijUzFIWMYNit+qUMLNMC2ZbO5GyqWTsiIJzBZKOCsdIgBsFmIACXsMgKvB8d01DqQE2OsZHBj
+n2BOIjWOavinrZpgNJgZh7QEvhb6r1N2JcRwPfrAjcCW4rYkHp/ZJOnJwGkuNVBXpNiAGLcmrBdJ
+u/TZFOj/uWhlOms0EtTgFb7oaT24/wSoR3axfl5RpMpF/9G/duji6P+kKFRJTB6hzpb2hike8KAE
+AAAxgDCCAlcCAQEwazBXMQswCQYDVQQGEwJESzEnMCUGA1UEChMeTkFUSU9OQUwgSVQgQU5EIFRF
+TEVDT00gQUdFTkNZMR8wHQYDVQQDExZQRVBQT0wgQUNDRVNTIFBPSU5UIENBAhA6PUOlKNukaO6Y
+SAmOntCtMAkGBSsOAwIaBQCggcYwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0B
+CQUxDxcNMTQwNTA2MTY1NjAyWjAjBgkqhkiG9w0BCQQxFgQUjVvVQgrWMaqgOks0B78fzPbMv+ow
+ZwYJKoZIhvcNAQkPMVowWDAHBgUrDgMCBzAKBggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYI
+KoZIhvcNAwICAUAwDQYIKoZIhvcNAwICASgwBwYFKw4DAhowCgYIKoZIhvcNAgUwDQYJKoZIhvcN
+AQEBBQAEggEAsPjNqJIcA4GtjpboIUwIHBLmh/45tgAMC7Y+8cu758iOyBdi8PC9lA8qJbzf5bKJ
+kr6CP0U5M3b2AulNVXzQInDcZGY89qNv8NBwyarNNJjhleGm3qAmRHv7CNODtWD3HV8IUX1yFCHW
+9fO7TjVUVRIKTUHZE4W5KFIFxQDG5U4Ad4CI48CPdXX+J1dq/ehpwiFdwhIQzVwXOhpNhppBJ5My
+5Kqi2YKU+VVpc+KjabyKG6ks7lK5QCXV8lj3xF76csOa3aYQPgmIeT6nPp++SGazIwuuw3T6WmcF
+BarqNZ/KsoNG19KBmGfm910Bdlr6eSedyaMFoBRvSshWYCasTQAAAAAAAAAA
+
+--------_=_NextPart_001_071EE00D.7087D242--
+
+
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/unit4-mdn-error.txt b/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/unit4-mdn-error.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e9a1a6532f066d6abdc51b9bcace9030bc8067ca
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/unit4-mdn-error.txt
@@ -0,0 +1,78 @@
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-1; boundary="----=_Part_8_1114200408.1399392201942"
+
+------=_Part_8_1114200408.1399392201942
+Content-Type: multipart/report; report-type=disposition-notification;
+ boundary="----=_Part_6_205642152.1399392201937"
+
+------=_Part_6_205642152.1399392201937
+Content-Type: text/plain
+Content-Transfer-Encoding: 7bit
+
+The following headers were received:
+date: Tue, 06 May 2014 18:03:30 +0200
+message-id: 437a76b5-0a91-470d-87eb-1b4f1e125d86
+subject: AS2 message from OXALIS
+content-type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-1;
+host: ap-test.unit4.com
+x-forwarded-for: 195.1.61.4
+connection: close
+as2-from: APP_1000000006
+as2-to: APP_1000000009
+disposition-notification-to: not.in.use@unit4.com
+disposition-notification-options: signed-receipt-protocol=required,pkcs7-signature; signed-receipt-micalg=required,sha1
+as2-version: 1.2
+user-agent: Apache-HttpClient/4.3.1 (java 1.5)
+accept-encoding: gzip,deflate
+content-length: 144523
+
+The message sent to AS2 System id APP_1000000006 on Tue, 06 May 2014 18:03:21 +0200 with subject AS2 MDN as you requested has been received.It has been processed successfully.
+------=_Part_6_205642152.1399392201937
+Content-Type: message/disposition-notification
+Content-Transfer-Encoding: 7bit
+
+Reporting-UA: Oxalis
+Disposition: automatic-action/MDN-sent-automatically; processed
+Original-Recipient: rfc822; APP_1000000006
+Final-Recipient: rfc822; APP_1000000006
+Original-Message-ID: 437a76b5-0a91-470d-87eb-1b4f1e125d86
+Received-Content-MIC: GrW0abLVrbKXxkMdDmAfDZoW3w0=, sha1
+Added-Header: This header was manually added after signing so that the signature should break
+
+------=_Part_6_205642152.1399392201937--
+
+------=_Part_8_1114200408.1399392201942
+Content-Type: application/pkcs7-signature; name=smime.p7s; smime-type=signed-data
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="smime.p7s"
+Content-Description: S/MIME Cryptographic Signature
+
+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
+------=_Part_8_1114200408.1399392201942--
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/unit4-mdn-negative.txt b/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/unit4-mdn-negative.txt
new file mode 100644
index 0000000000000000000000000000000000000000..95cd32c829188ad6c1a4fdd0263433add293fbac
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/unit4-mdn-negative.txt
@@ -0,0 +1,79 @@
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-1; boundary="----=_Part_34_1575144894.1399904449035"
+
+------=_Part_34_1575144894.1399904449035
+Content-Type: multipart/report; report-type=disposition-notification;
+ boundary="----=_Part_32_573291651.1399904449032"
+
+------=_Part_32_573291651.1399904449032
+Content-Type: text/plain
+Content-Transfer-Encoding: 7bit
+
+The following headers were received:
+date: ma, 12 mai 2014 16:20:55 +0200
+message-id: 67c6fb66-5d91-411a-be50-0126d1510a9d
+subject: AS2 message from OXALIS
+content-type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-1;
+host: ap-test.unit4.com
+x-forwarded-for: 195.1.61.4
+connection: close
+as2-from: APP_1000000006
+as2-to: APP_1000000006
+disposition-notification-to: not.in.use@unit4.com
+disposition-notification-options: signed-receipt-protocol=required,pkcs7-signature; signed-receipt-micalg=required,sha1
+as2-version: 1.2
+user-agent: Apache-HttpClient/4.3.1 (java 1.5)
+accept-encoding: gzip,deflate
+content-length: 3199
+
+The message sent to AS2 System id APP_1000000006 on Mon, 12 May 2014 16:20:49 +0200 with subject AS2 MDN as you requested has been received.It has been processed The warning/error message is:
+ERROR: Index: 0, Size: 0
+------=_Part_32_573291651.1399904449032
+Content-Type: message/disposition-notification
+Content-Transfer-Encoding: 7bit
+
+Reporting-UA: Oxalis
+Disposition: automatic-action/MDN-sent-automatically; processed/ERROR: Index: 0, Size: 0
+Original-Recipient: rfc822; APP_1000000006
+Final-Recipient: rfc822; APP_1000000006
+Original-Message-ID: 67c6fb66-5d91-411a-be50-0126d1510a9d
+Received-Content-MIC: QgWi3uJbd2DI9yuUUWTxvtugm9w=, sha1
+
+------=_Part_32_573291651.1399904449032--
+
+------=_Part_34_1575144894.1399904449035
+Content-Type: application/pkcs7-signature; name=smime.p7s; smime-type=signed-data
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="smime.p7s"
+Content-Description: S/MIME Cryptographic Signature
+
+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
+------=_Part_34_1575144894.1399904449035--
+
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/unit4-mdn.txt b/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/unit4-mdn.txt
new file mode 100644
index 0000000000000000000000000000000000000000..164b810e6b239c630dc08992224300f9abca5cff
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/resources/real-mdn-examples/unit4-mdn.txt
@@ -0,0 +1,77 @@
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-1; boundary="----=_Part_8_1114200408.1399392201942"
+
+------=_Part_8_1114200408.1399392201942
+Content-Type: multipart/report; report-type=disposition-notification;
+ boundary="----=_Part_6_205642152.1399392201937"
+
+------=_Part_6_205642152.1399392201937
+Content-Type: text/plain
+Content-Transfer-Encoding: 7bit
+
+The following headers were received:
+date: Tue, 06 May 2014 18:03:30 +0200
+message-id: 437a76b5-0a91-470d-87eb-1b4f1e125d86
+subject: AS2 message from OXALIS
+content-type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-1;
+host: ap-test.unit4.com
+x-forwarded-for: 195.1.61.4
+connection: close
+as2-from: APP_1000000006
+as2-to: APP_1000000009
+disposition-notification-to: not.in.use@unit4.com
+disposition-notification-options: signed-receipt-protocol=required,pkcs7-signature; signed-receipt-micalg=required,sha1
+as2-version: 1.2
+user-agent: Apache-HttpClient/4.3.1 (java 1.5)
+accept-encoding: gzip,deflate
+content-length: 144523
+
+The message sent to AS2 System id APP_1000000006 on Tue, 06 May 2014 18:03:21 +0200 with subject AS2 MDN as you requested has been received.It has been processed successfully.
+------=_Part_6_205642152.1399392201937
+Content-Type: message/disposition-notification
+Content-Transfer-Encoding: 7bit
+
+Reporting-UA: Oxalis
+Disposition: automatic-action/MDN-sent-automatically; processed
+Original-Recipient: rfc822; APP_1000000006
+Final-Recipient: rfc822; APP_1000000006
+Original-Message-ID: 437a76b5-0a91-470d-87eb-1b4f1e125d86
+Received-Content-MIC: GrW0abLVrbKXxkMdDmAfDZoW3w0=, sha1
+
+------=_Part_6_205642152.1399392201937--
+
+------=_Part_8_1114200408.1399392201942
+Content-Type: application/pkcs7-signature; name=smime.p7s; smime-type=signed-data
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="smime.p7s"
+Content-Description: S/MIME Cryptographic Signature
+
+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
+------=_Part_8_1114200408.1399392201942--
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/reference.conf b/oxalis-extension/oxalis-as2/src/test/resources/reference.conf
new file mode 100644
index 0000000000000000000000000000000000000000..47a59b1d377e45187dc7619334aaee4802964b1e
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/resources/reference.conf
@@ -0,0 +1,10 @@
+oxalis.module.inbound.mocking.class = network.oxalis.as2.mocking.InboundMockingModule
+
+brave.reporter = noop
+oxalis.statistics.service = noop
+oxalis.persister.payload = noop
+oxalis.persister.receipt = noop
+
+oxalis.http.pool.max_route = 10
+oxalis.http.pool.validate_after_inactivity = 1000
+oxalis.http.pool.time_to_live = 30
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/sample-as2-post-headers.txt b/oxalis-extension/oxalis-as2/src/test/resources/sample-as2-post-headers.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2ea76926e443a088e120907bd8ae654619df041c
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/resources/sample-as2-post-headers.txt
@@ -0,0 +1,14 @@
+as2-from: APP_1000000135
+as2-to: peppol-APP_1000000006
+disposition-notification-to: not.in.use@difi.no
+disposition-notification-options: signed-receipt-protocol=required,pkcs7-signature; signed-receipt-micalg=required,sha1
+as2-version: 1.0
+subject: AS2 message from OXALIS
+message-id: 8c096de8-ec58-4dc6-a9c4-6c465b2c83c5
+date: ti, 22 des 2015 21:50:17 +0100
+content-length: 11448
+content-type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-1; boundary="----=_Part_1_1095273238.1450817416972"
+host: localhost:8443
+connection: Keep-Alive
+user-agent: Apache-HttpClient/4.3.6 (java 1.5)
+accept-encoding: gzip,deflate
\ No newline at end of file
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/sample.asice b/oxalis-extension/oxalis-as2/src/test/resources/sample.asice
new file mode 100644
index 0000000000000000000000000000000000000000..186ea597143ba820e8b92775ab49d5fe614e401e
Binary files /dev/null and b/oxalis-extension/oxalis-as2/src/test/resources/sample.asice differ
diff --git a/oxalis-extension/oxalis-as2/src/test/resources/sbdh-asic.xml b/oxalis-extension/oxalis-as2/src/test/resources/sbdh-asic.xml
new file mode 100644
index 0000000000000000000000000000000000000000..66eb24b521ec2732038e72a4fc7c7030d95f7a58
--- /dev/null
+++ b/oxalis-extension/oxalis-as2/src/test/resources/sbdh-asic.xml
@@ -0,0 +1,154 @@
+
+
+
+ 1.0
+
+ 9908:810018909
+
+
+ 9908:810418052
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Tender-2
+ 2.1
+ FA4A6819-6149-4134-95C3-C53A65338EB6
+ Tender
+ 2015-07-26T20:08:00+01:00
+
+
+ 1
+
+ application/vnd.etsi.asic-e+zip
+ #asic
+ Base64 encoded ASiC archive containing business documents.
+
+
+
+
+ PROCESSID
+ urn:www.cenbii.eu:profile:bii46:ver3.0
+
+
+ DOCUMENTID
+
+ urn:oasis:names:specification:ubl:schema:xsd:Tender-2::Tender##urn:www.cenbii.eu:transaction:biitrdm090:ver3.0::2.1
+
+
+
+
+
+ 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
+ QS1JTkYvbWFuaWZlc3QueG1srZHBasMwDIbveQrj63CS3jaTtLc9wfYAaqyuBls2llKSPf2clMFg
+ MHqYbhK/vv8XGk5LDOqGhX2iUR/aXiukKTlPH6N+f3s1z1qxADkIiXDUK7I+HZuB+GAjkL8gi6oM
+ YltHo54L2QTsawsR2cpkU0ZyaZojkti79HvTbobHRtXaiRcf0FRZWdXeziGYDHIddaf3SUTnwcia
+ axTIOfgJpCbvbuRaFPZttZ4MPn36rLuHwHx217am+pu/CR7jSXGxf+kNz+foxUi9HYthiDngf/rc
+ iaYguIitLPIbLLhIlwN42phD9/Nnx+YLUEsHCFuZArnqAAAA+wEAAFBLAQIKAAoAAAgAAI1ZMEeK
+ IflFHwAAAB8AAAAIAAAAKAAAAAAAAAAAAAAAAABtaW1ldHlwZW1pbWV0eXBlPWFwcGxpY2F0aW9u
+ L3ZuZC5ldHNpLmFzaWMtZSt6aXBQSwECFAAUAAgICACNWTBH1R7KSasEAADfCwAACAAAAAAAAAAA
+ AAAAAABFAAAAc2JkaC54bWxQSwECFAAUAAgICACNWTBHqhrKndAGAABLEwAAIAAAAAAAAAAAAAAA
+ AAAmBQAAdHJkbTA5MC1zdWJtaXQtdGVuZGVyLXNhbXBsZS54bWxQSwECFAAUAAgICACNWTBHGHwq
+ qDcAAAA5AAAAEQAAAAAAAAAAAAAAAABEDAAAc2FtcGxlLXJlYWRtZS50eHRQSwECFAAUAAgICACN
+ WTBHjEPERu8BAABwBAAAGQAAAAAAAAAAAAAAAAC6DAAATUVUQS1JTkYvYXNpY21hbmlmZXN0Lnht
+ bFBLAQIUABQACAgIAI1ZMEeS19UY5gUAAGEHAAA7AAAAAAAAAAAAAAAAAPAOAABNRVRBLUlORi9z
+ aWduYXR1cmUtNGFjMjIwYTUtYzVkMi00YmFlLTliZmItODVhNjdhMDY3ZTZjLnA3c1BLAQIUABQA
+ CAgIAI1ZMEdbmQK56gAAAPsBAAAVAAAAAAAAAAAAAAAAAD8VAABNRVRBLUlORi9tYW5pZmVzdC54
+ bWxQSwUGAAAAAAcABwAUAgAAbBYAACgAbWltZXR5cGU9YXBwbGljYXRpb24vdm5kLmV0c2kuYXNp
+ Yy1lK3ppcA==
+
+
+
diff --git a/oxalis-extension/oxalis-extension-example/README.md b/oxalis-extension/oxalis-extension-example/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..4962976e3fcc9fef9792acae325b49540e8be21d
--- /dev/null
+++ b/oxalis-extension/oxalis-extension-example/README.md
@@ -0,0 +1,23 @@
+# Example extension
+
+This is an example extension providing a simple implementation of TransmissionVerifier to log each message (metadata only) to be verified.
+
+This implementation consists of the following files:
+
+* [LoggingTransmissionVerifier](src/main/java/network/oxalis/ext/example/LoggingTransmissionVerifier.java) - The implementation.
+* [ExampleModule](src/main/java/network/oxalis/ext/example/ExampleModule.java) - Guice module to make the implementation known to Oxalis.
+* [reference.conf](src/main/resources/reference.conf) - Configuration to register the Guice module during Oxalis startup.
+* [pom.xml](pom.xml) - Maven configuration to build an extension using Maven.
+
+Extensions are included in classpath as of Oxalis 4.0.0.
+The best ways of deploying your Oxalis instance:
+
+* WAR file - Build your own WAR file containing the Oxalis libraries and your extensions for deployment on your servers.
+* Oxalis Server - Include extensions and additional libaries in the `ext` folder.
+* Docker - Include extensions and additional libraries in `/oxalis/ext/`.
+
+To enable the verifier implementation included in this extension must the following be included in the oxalis configuration file:
+
+```properties
+oxalis.transmission.verifier = logging
+```
\ No newline at end of file
diff --git a/oxalis-extension/oxalis-extension-example/pom.xml b/oxalis-extension/oxalis-extension-example/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..428e431348a8273b93f69ed31a1080627579d8d2
--- /dev/null
+++ b/oxalis-extension/oxalis-extension-example/pom.xml
@@ -0,0 +1,47 @@
+
+
+
+
+
+ oxalis-extension
+ dk.erst.oxalis
+ 0.9.0-e2f4121ccb55b5a60e6edebf7b28d277741d6789
+
+ 4.0.0
+
+ oxalis-extension-example
+
+ Oxalis :: Ext :: Example
+
+
+
+
\ No newline at end of file
diff --git a/oxalis-extension/oxalis-extension-example/src/main/java/network/oxalis/ext/example/ExampleModule.java b/oxalis-extension/oxalis-extension-example/src/main/java/network/oxalis/ext/example/ExampleModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..e7990d25d2150493b3a0b4110a69ab764fc467fd
--- /dev/null
+++ b/oxalis-extension/oxalis-extension-example/src/main/java/network/oxalis/ext/example/ExampleModule.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.ext.example;
+
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.api.transmission.TransmissionVerifier;
+import network.oxalis.commons.guice.OxalisModule;
+
+/**
+ * Guice module where we bind our implementations.
+ *
+ * @author erlend
+ * @since 4.0.1
+ */
+@Slf4j
+public class ExampleModule extends OxalisModule {
+
+ public ExampleModule() {
+ log.info("Loaded.");
+ }
+
+ @Override
+ protected void configure() {
+ bindTyped(TransmissionVerifier.class, LoggingTransmissionVerifier.class);
+ }
+}
diff --git a/oxalis-extension/oxalis-extension-example/src/main/java/network/oxalis/ext/example/LoggingTransmissionVerifier.java b/oxalis-extension/oxalis-extension-example/src/main/java/network/oxalis/ext/example/LoggingTransmissionVerifier.java
new file mode 100644
index 0000000000000000000000000000000000000000..71abea22f345db159220b1d491c70bdd0f162186
--- /dev/null
+++ b/oxalis-extension/oxalis-extension-example/src/main/java/network/oxalis/ext/example/LoggingTransmissionVerifier.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.ext.example;
+
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.api.model.Direction;
+import network.oxalis.api.transmission.TransmissionVerifier;
+import network.oxalis.api.util.Type;
+import network.oxalis.vefa.peppol.common.model.Header;
+
+import javax.inject.Singleton;
+
+/**
+ * This is a simple implementation of {@link TransmissionVerifier} where each message is logged.
+ *
+ * @author erlend
+ * @since 4.0.1
+ */
+@Slf4j
+@Singleton
+@Type("logging") // Name given to the implementation for use in configuration.
+public class LoggingTransmissionVerifier implements TransmissionVerifier {
+
+ @Override
+ public void verify(Header header, Direction direction) {
+ log.info("Direction: {} | Sender/Receiver: {}/{} | Instance identifier: {}",
+ direction,
+ header.getSender().getIdentifier(),
+ header.getReceiver().getIdentifier(),
+ header.getIdentifier());
+ }
+}
diff --git a/oxalis-extension/oxalis-extension-example/src/main/resources/reference.conf b/oxalis-extension/oxalis-extension-example/src/main/resources/reference.conf
new file mode 100644
index 0000000000000000000000000000000000000000..c258b75a70f200ea9147d5a3b127afda59ee8538
--- /dev/null
+++ b/oxalis-extension/oxalis-extension-example/src/main/resources/reference.conf
@@ -0,0 +1,2 @@
+// Making our (Guice) module available to Oxalis.
+oxalis.module.ext-example.main.class = network.oxalis.ext.example.ExampleModule
diff --git a/oxalis-extension/oxalis-extension-testbed/.gitignore b/oxalis-extension/oxalis-extension-testbed/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..bc910ca20370c4db4bbf0c05f58112b25531eb64
--- /dev/null
+++ b/oxalis-extension/oxalis-extension-testbed/.gitignore
@@ -0,0 +1 @@
+*.http
\ No newline at end of file
diff --git a/oxalis-extension/oxalis-extension-testbed/pom.xml b/oxalis-extension/oxalis-extension-testbed/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..192d34c3a03d8b8166b8f0527eaad9f383e825e0
--- /dev/null
+++ b/oxalis-extension/oxalis-extension-testbed/pom.xml
@@ -0,0 +1,77 @@
+
+
+
+ oxalis-extension
+ dk.erst.oxalis
+ 0.9.0-e2f4121ccb55b5a60e6edebf7b28d277741d6789
+
+ 4.0.0
+
+ oxalis-extension-testbed
+
+ Oxalis :: Ext :: Testbed connector
+
+
+
+
+ dk.erst.oxalis
+ oxalis-inbound
+
+
+ dk.erst.oxalis
+ oxalis-outbound
+
+
+
+
+ javax.servlet
+ javax.servlet-api
+ provided
+
+
+
+
+
+
+ org.codehaus.mojo
+ jaxb2-maven-plugin
+ 1.6
+
+
+ xjc
+
+ xjc
+
+
+
+
+ UTF-8
+ 2.1
+
+
+
+ org.codehaus.mojo
+ properties-maven-plugin
+ 1.1.0
+
+
+ set-additional-system-properties
+
+ set-system-properties
+
+
+
+
+
+
+ javax.xml.accessExternalSchema
+ all
+
+
+ ${project.build.outputDirectory}/project.properties
+
+
+
+
+
+
\ No newline at end of file
diff --git a/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedConf.java b/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedConf.java
new file mode 100644
index 0000000000000000000000000000000000000000..6bf26a3a569497b89120adb24fa1c19d158a0890
--- /dev/null
+++ b/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedConf.java
@@ -0,0 +1,22 @@
+package network.oxalis.ext.testbed.v1;
+
+import network.oxalis.api.settings.DefaultValue;
+import network.oxalis.api.settings.Path;
+import network.oxalis.api.settings.Title;
+
+/**
+ * @author erlend
+ * @since 4.0.3
+ */
+@Title("Testbed")
+public enum TestbedConf {
+
+ @Path("oxalis.testbed.v1.password")
+ @DefaultValue("testbed")
+ PASSWORD,
+
+ @Path("oxalis.testbed.v1.controller")
+ @DefaultValue("https://localhost/controller")
+ CONTROLLER,
+
+}
diff --git a/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedErrorTracker.java b/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedErrorTracker.java
new file mode 100644
index 0000000000000000000000000000000000000000..00887022d8b3190a0a865db85f3ca436d46e8e1a
--- /dev/null
+++ b/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedErrorTracker.java
@@ -0,0 +1,26 @@
+package network.oxalis.ext.testbed.v1;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import network.oxalis.api.error.ErrorTracker;
+import network.oxalis.api.model.Direction;
+import network.oxalis.ext.testbed.v1.jaxb.ErrorType;
+
+/**
+ * @author erlend
+ */
+@Singleton
+public class TestbedErrorTracker implements ErrorTracker {
+
+ @Inject
+ private TestbedSender sender;
+
+ @Override
+ public String track(Direction direction, Exception e, boolean handled) {
+ ErrorType error = new ErrorType();
+ error.setMessage(e.getMessage());
+ sender.send(error);
+
+ return null;
+ }
+}
diff --git a/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedFilter.java b/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedFilter.java
new file mode 100644
index 0000000000000000000000000000000000000000..8f83f3d4f266f499a1c1cdae12a2839286ae1968
--- /dev/null
+++ b/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedFilter.java
@@ -0,0 +1,56 @@
+package network.oxalis.ext.testbed.v1;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @author erlend
+ */
+@Singleton
+@Slf4j
+public class TestbedFilter extends HttpFilter {
+
+ @Inject
+ private TestbedSecurity security;
+
+ @Override
+ protected void doFilter(HttpServletRequest req, HttpServletResponse res, FilterChain chain)
+ throws IOException, ServletException {
+ if (req.getHeader("Authorization") == null) {
+ noAccess(res);
+ return;
+ }
+
+ List parts = Stream.of(req.getHeader("Authorization").trim().split("\\s+", 2))
+ .map(String::trim)
+ .collect(Collectors.toList());
+
+ if (parts.size() != 2 || !parts.get(0).equals("Digest")) {
+ noAccess(res);
+ return;
+ }
+
+ if (!parts.get(1).equals(security.getExpectedAuthorization())) {
+ noAccess(res);
+ return;
+ }
+
+ chain.doFilter(req, res);
+ }
+
+ private void noAccess(HttpServletResponse res) throws IOException {
+ res.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+ res.getWriter().write("No access.");
+ }
+}
diff --git a/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedJaxb.java b/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedJaxb.java
new file mode 100644
index 0000000000000000000000000000000000000000..b6dad133220f3d8cc62ef138b6fa90324076406e
--- /dev/null
+++ b/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedJaxb.java
@@ -0,0 +1,36 @@
+package network.oxalis.ext.testbed.v1;
+
+import network.oxalis.ext.testbed.v1.jaxb.*;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+
+/**
+ * @author erlend
+ */
+public class TestbedJaxb {
+
+ public static final JAXBContext JAXB_CONTEXT;
+
+ public static final ObjectFactory OBJECT_FACTORY = new ObjectFactory();
+
+ static {
+ try {
+ JAXB_CONTEXT = JAXBContext.newInstance(InformationType.class, OutboundType.class,
+ OutboundResponseType.class, InboundType.class, ErrorType.class);
+ } catch (JAXBException e) {
+ throw new IllegalStateException(e.getMessage(), e);
+ }
+ }
+
+ public static Marshaller marshaller() throws JAXBException {
+ return JAXB_CONTEXT.createMarshaller();
+ }
+
+ public static Unmarshaller unmarshaller() throws JAXBException {
+ return JAXB_CONTEXT.createUnmarshaller();
+ }
+
+}
diff --git a/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedModule.java b/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..ff934240daa1cf601719ff251ee84cae1a856d5a
--- /dev/null
+++ b/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedModule.java
@@ -0,0 +1,29 @@
+package network.oxalis.ext.testbed.v1;
+
+import com.google.inject.Key;
+import com.google.inject.name.Names;
+import com.google.inject.servlet.ServletModule;
+import network.oxalis.api.error.ErrorTracker;
+import network.oxalis.api.persist.PersisterHandler;
+import network.oxalis.commons.settings.SettingsBuilder;
+
+/**
+ * @author erlend
+ * @since 4.0.3
+ */
+public class TestbedModule extends ServletModule {
+
+ @Override
+ protected void configureServlets() {
+ SettingsBuilder.with(binder(), TestbedConf.class);
+
+ bind(Key.get(PersisterHandler.class, Names.named("testbed-v1")))
+ .to(TestbedPersisterHandler.class);
+
+ bind(Key.get(ErrorTracker.class, Names.named("testbed-v1")))
+ .to(TestbedErrorTracker.class);
+
+ serve("/testbed/v1").with(TestbedServlet.class);
+ filter("/testbed/v1").through(TestbedFilter.class);
+ }
+}
diff --git a/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedPersisterHandler.java b/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedPersisterHandler.java
new file mode 100644
index 0000000000000000000000000000000000000000..84377fc92e446aa811395e9f203bea70da29ee75
--- /dev/null
+++ b/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedPersisterHandler.java
@@ -0,0 +1,63 @@
+package network.oxalis.ext.testbed.v1;
+
+import com.google.common.io.ByteStreams;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.api.evidence.EvidenceFactory;
+import network.oxalis.api.inbound.InboundMetadata;
+import network.oxalis.api.lang.EvidenceException;
+import network.oxalis.api.model.TransmissionIdentifier;
+import network.oxalis.api.persist.PersisterHandler;
+import network.oxalis.api.util.Type;
+import network.oxalis.ext.testbed.v1.jaxb.InboundType;
+import network.oxalis.vefa.peppol.common.model.Header;
+
+import javax.inject.Named;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+/**
+ * @author erlend
+ */
+@Singleton
+@Type("testbed-v1")
+@Slf4j
+public class TestbedPersisterHandler implements PersisterHandler {
+
+ @Inject
+ @Named("rem")
+ private EvidenceFactory evidenceFactory;
+
+ @Inject
+ private TestbedSender sender;
+
+ @Override
+ public Path persist(TransmissionIdentifier transmissionIdentifier, Header header, InputStream inputStream)
+ throws IOException {
+ Path path = File.createTempFile("oxalis-testbed-inbound", header.getIdentifier().getIdentifier()).toPath();
+ try (OutputStream outputStream = Files.newOutputStream(path)) {
+ ByteStreams.copy(inputStream, outputStream);
+ }
+ return path;
+ }
+
+ @Override
+ public void persist(InboundMetadata inboundMetadata, Path payloadPath) throws IOException {
+ try (InputStream inputStream = Files.newInputStream(payloadPath)) {
+ InboundType inbound = new InboundType();
+ inbound.setTransportProfile(inboundMetadata.getProtocol().getIdentifier());
+ inbound.setPayload(ByteStreams.toByteArray(inputStream));
+ inbound.setReceipt(ByteStreams.toByteArray(evidenceFactory.write(inboundMetadata)));
+ sender.send(inbound);
+ } catch (EvidenceException e) {
+ log.error(e.getMessage(), e);
+ }
+
+ Files.delete(payloadPath);
+ }
+}
diff --git a/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedSecurity.java b/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedSecurity.java
new file mode 100644
index 0000000000000000000000000000000000000000..a41192dd61fe5da168be4330c669d830e3b17f5c
--- /dev/null
+++ b/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedSecurity.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2010-2017 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.ext.testbed.v1;
+
+import com.google.common.hash.Hashing;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import network.oxalis.api.settings.Settings;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * @author erlend
+ */
+@Singleton
+public class TestbedSecurity {
+
+ private String expectedAuthorization;
+
+ @Inject
+ public void init(Settings settings) {
+ expectedAuthorization = Hashing.sha256()
+ .hashString(settings.getString(TestbedConf.PASSWORD), StandardCharsets.UTF_8)
+ .toString();
+
+ System.out.println(expectedAuthorization);
+ }
+
+ public String getExpectedAuthorization() {
+ return expectedAuthorization;
+ }
+}
diff --git a/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedSender.java b/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedSender.java
new file mode 100644
index 0000000000000000000000000000000000000000..ce1d06fcf7798be17b077ff913c979f188b4cc14
--- /dev/null
+++ b/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedSender.java
@@ -0,0 +1,74 @@
+package network.oxalis.ext.testbed.v1;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.api.settings.Settings;
+import network.oxalis.ext.testbed.v1.jaxb.ErrorType;
+import network.oxalis.ext.testbed.v1.jaxb.InboundType;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.entity.ContentType;
+import org.apache.http.impl.client.CloseableHttpClient;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+/**
+ * @author erlend
+ */
+@Singleton
+@Slf4j
+public class TestbedSender {
+
+ @Inject
+ private TestbedSecurity security;
+
+ @Inject
+ private Settings settings;
+
+ @Inject
+ private CloseableHttpClient httpClient;
+
+ public void send(InboundType inbound) throws IOException {
+ try {
+ HttpPost httpPost = new HttpPost(settings.getString(TestbedConf.CONTROLLER));
+ httpPost.setEntity(new ByteArrayEntity(prepareContent(TestbedJaxb.OBJECT_FACTORY.createInbound(inbound)), ContentType.APPLICATION_XML));
+
+ try (CloseableHttpResponse response = send(httpPost)) {
+ // No action at the moment.
+ }
+ } catch (JAXBException e) {
+ throw new IOException("Unable to create document to send to testbed controller.", e);
+ }
+ }
+
+ public void send(ErrorType error) {
+ try {
+ HttpPut httpPut = new HttpPut(settings.getString(TestbedConf.CONTROLLER));
+ httpPut.setEntity(new ByteArrayEntity(prepareContent(TestbedJaxb.OBJECT_FACTORY.createError(error)), ContentType.APPLICATION_XML));
+
+ try (CloseableHttpResponse response = send(httpPut)) {
+ // No action at the moment.
+ }
+ } catch (JAXBException | IOException e) {
+ log.warn("Unable to send error to testbed controller.", e);
+ }
+ }
+
+ private byte[] prepareContent(JAXBElement element) throws JAXBException {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ TestbedJaxb.marshaller().marshal(element, baos);
+ return baos.toByteArray();
+ }
+
+ private CloseableHttpResponse send(HttpUriRequest request) throws IOException {
+ request.addHeader("Authorization", String.format("Digest %s", security.getExpectedAuthorization()));
+ return httpClient.execute(request);
+ }
+}
diff --git a/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedServlet.java b/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedServlet.java
new file mode 100644
index 0000000000000000000000000000000000000000..59e75bf30f13517b00533769212d19423d49dd4e
--- /dev/null
+++ b/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedServlet.java
@@ -0,0 +1,121 @@
+package network.oxalis.ext.testbed.v1;
+
+import com.google.common.io.ByteStreams;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
+import network.oxalis.api.evidence.EvidenceFactory;
+import network.oxalis.api.outbound.TransmissionMessage;
+import network.oxalis.api.outbound.TransmissionResponse;
+import network.oxalis.api.outbound.Transmitter;
+import network.oxalis.commons.util.OxalisVersion;
+import network.oxalis.ext.testbed.v1.jaxb.InformationType;
+import network.oxalis.ext.testbed.v1.jaxb.OutboundResponseType;
+import network.oxalis.ext.testbed.v1.jaxb.OutboundType;
+import network.oxalis.outbound.transmission.TransmissionRequestFactory;
+import network.oxalis.vefa.peppol.common.model.TransportProfile;
+
+import javax.inject.Named;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.bind.JAXBException;
+import javax.xml.transform.stream.StreamSource;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.X509Certificate;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author erlend
+ */
+@Singleton
+public class TestbedServlet extends HttpServlet {
+
+ @Inject
+ private Provider transmissionRequestFactory;
+
+ @Inject
+ private Provider transmitter;
+
+ @Inject
+ @Named("rem")
+ private EvidenceFactory evidenceFactory;
+
+ @Inject
+ @Named("prioritized")
+ private List transportProfiles;
+
+ @Inject
+ private X509Certificate certificate;
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ try {
+ InformationType informationType = new InformationType();
+ informationType.setName("Oxalis");
+ informationType.setVersion(OxalisVersion.getVersion());
+ informationType.setApiVersion("1.0");
+ informationType.getTransportProfile().addAll(transportProfiles.stream()
+ .map(TransportProfile::getIdentifier)
+ .collect(Collectors.toList()));
+ informationType.setCertificate(certificate.getEncoded());
+
+ resp.addHeader("Content-Type", "application/xml;charset=UTF-8");
+ TestbedJaxb.marshaller().marshal(
+ TestbedJaxb.OBJECT_FACTORY.createInformation(informationType),
+ resp.getWriter());
+ } catch (JAXBException | CertificateEncodingException e) {
+ throw new ServletException(e.getMessage(), e);
+ }
+ }
+
+ @Override
+ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ try {
+ OutboundType outbound = TestbedJaxb.unmarshaller()
+ .unmarshal(new StreamSource(req.getInputStream()), OutboundType.class)
+ .getValue();
+
+ TransmissionMessage transmissionMessage = transmissionRequestFactory.get()
+ .newInstance(new ByteArrayInputStream(outbound.getPayload()));
+
+ TransmissionResponse transmissionResponse;
+ if (outbound.getDestination() == null) {
+ transmissionResponse = transmitter.get()
+ .transmit(transmissionMessage);
+ } else {
+ transmissionResponse = transmitter.get()
+ .transmit(new TestbedTransmissionRequest(transmissionMessage, outbound.getDestination()));
+ }
+
+ InputStream evidenceInputStream = evidenceFactory.write(transmissionResponse);
+
+ OutboundResponseType response = new OutboundResponseType();
+ response.setReceipt(ByteStreams.toByteArray(evidenceInputStream));
+
+ resp.addHeader("Content-Type", "application/xml;charset=UTF-8");
+ TestbedJaxb.marshaller().marshal(
+ TestbedJaxb.OBJECT_FACTORY.createOutboundResponse(response),
+ resp.getWriter());
+ } catch (JAXBException e) {
+ throw new ServletException(e.getMessage(), e);
+ } catch (Exception e) {
+ try {
+ OutboundResponseType response = new OutboundResponseType();
+ response.setError(e.getMessage());
+
+ resp.addHeader("Content-Type", "application/xml;charset=UTF-8");
+ TestbedJaxb.marshaller().marshal(
+ TestbedJaxb.OBJECT_FACTORY.createOutboundResponse(response),
+ resp.getWriter());
+ } catch (JAXBException ex) {
+ throw new ServletException(ex.getMessage(), ex);
+ }
+ }
+ }
+}
diff --git a/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedTransmissionRequest.java b/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedTransmissionRequest.java
new file mode 100644
index 0000000000000000000000000000000000000000..179a6ab8b4470fd89a8d1c65d176baa8b348b85b
--- /dev/null
+++ b/oxalis-extension/oxalis-extension-testbed/src/main/java/network/oxalis/ext/testbed/v1/TestbedTransmissionRequest.java
@@ -0,0 +1,58 @@
+package network.oxalis.ext.testbed.v1;
+
+import network.oxalis.api.outbound.TransmissionMessage;
+import network.oxalis.api.outbound.TransmissionRequest;
+import network.oxalis.api.tag.Tag;
+import network.oxalis.commons.security.CertificateUtils;
+import network.oxalis.ext.testbed.v1.jaxb.DestinationType;
+import network.oxalis.vefa.peppol.common.model.Endpoint;
+import network.oxalis.vefa.peppol.common.model.Header;
+import network.oxalis.vefa.peppol.common.model.TransportProfile;
+
+import java.io.InputStream;
+import java.net.URI;
+import java.security.cert.CertificateException;
+
+/**
+ * @author erlend
+ */
+public class TestbedTransmissionRequest implements TransmissionRequest {
+
+ private TransmissionMessage transmissionMessage;
+
+ private Endpoint endpoint;
+
+ public TestbedTransmissionRequest(TransmissionMessage transmissionMessage, DestinationType destination)
+ throws CertificateException {
+ this(transmissionMessage, Endpoint.of(
+ TransportProfile.of(destination.getTransportProfile()),
+ URI.create(destination.getURI()),
+ CertificateUtils.parseCertificate(destination.getCertificate())
+ ));
+ }
+
+ public TestbedTransmissionRequest(TransmissionMessage transmissionMessage, Endpoint endpoint) {
+ this.transmissionMessage = transmissionMessage;
+ this.endpoint = endpoint;
+ }
+
+ @Override
+ public Endpoint getEndpoint() {
+ return endpoint;
+ }
+
+ @Override
+ public Header getHeader() {
+ return transmissionMessage.getHeader();
+ }
+
+ @Override
+ public InputStream getPayload() {
+ return transmissionMessage.getPayload();
+ }
+
+ @Override
+ public Tag getTag() {
+ return transmissionMessage.getTag();
+ }
+}
diff --git a/oxalis-extension/oxalis-extension-testbed/src/main/resources/reference.conf b/oxalis-extension/oxalis-extension-testbed/src/main/resources/reference.conf
new file mode 100644
index 0000000000000000000000000000000000000000..49cd6622e45d3f5f2f7eb7dfdbc14fa435c5d08c
--- /dev/null
+++ b/oxalis-extension/oxalis-extension-testbed/src/main/resources/reference.conf
@@ -0,0 +1,4 @@
+oxalis.module.ext-testbed.v1 = {
+ class = network.oxalis.ext.testbed.v1.TestbedModule
+ enabled = false
+}
diff --git a/oxalis-extension/oxalis-extension-testbed/src/main/xjb/bindings.xjb b/oxalis-extension/oxalis-extension-testbed/src/main/xjb/bindings.xjb
new file mode 100644
index 0000000000000000000000000000000000000000..65b3ca0e304c73c7b91f731dedcf6067bd286970
--- /dev/null
+++ b/oxalis-extension/oxalis-extension-testbed/src/main/xjb/bindings.xjb
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/oxalis-extension/oxalis-extension-testbed/src/main/xsd/testbed-v1.xsd b/oxalis-extension/oxalis-extension-testbed/src/main/xsd/testbed-v1.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..85ee953754ca8617caaa849ab24f7073b7160c4c
--- /dev/null
+++ b/oxalis-extension/oxalis-extension-testbed/src/main/xsd/testbed-v1.xsd
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/oxalis-extension/pom.xml b/oxalis-extension/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ca331918a8e4cd920e8458a3fe07046365405efb
--- /dev/null
+++ b/oxalis-extension/pom.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+ oxalis
+ dk.erst.oxalis
+ 0.9.0-e2f4121ccb55b5a60e6edebf7b28d277741d6789
+
+ 4.0.0
+
+ oxalis-extension
+ pom
+
+ Oxalis :: Ext
+
+
+
+
+ oxalis-extension-example
+ oxalis-extension-testbed
+
+
+
+
+ dk.erst.oxalis
+ oxalis-commons
+ provided
+
+
+
+
diff --git a/oxalis-inbound/pom.xml b/oxalis-inbound/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d909dd079c347a4dd54e6e8cd7d662b71bd68d7a
--- /dev/null
+++ b/oxalis-inbound/pom.xml
@@ -0,0 +1,123 @@
+
+
+
+
+ 4.0.0
+
+
+ dk.erst.oxalis
+ oxalis
+ 0.9.0-e2f4121ccb55b5a60e6edebf7b28d277741d6789
+
+
+ oxalis-inbound
+
+ Oxalis :: Core :: Inbound
+ Component for handling receiving.
+ https://rep.erst.dk/git/openebusiness/nemhandeledelivery/oxalis
+
+
+ Erhvervsstyrelsen
+ https://nemhandel.dk/
+
+
+
+
+
+
+ org.slf4j
+ slf4j-api
+
+
+ ch.qos.logback
+ logback-classic
+
+
+
+ com.google.guava
+ guava
+
+
+
+ joda-time
+ joda-time
+
+
+
+
+ javax.servlet
+ javax.servlet-api
+ provided
+
+
+
+
+ dk.erst.oxalis
+ oxalis-commons
+
+
+ dk.erst.oxalis
+ oxalis-test
+ test
+
+
+
+
+
+
+ com.google.inject.extensions
+ guice-servlet
+
+
+
+
+ org.bouncycastle
+ bcmail-jdk15on
+
+
+
+
+ io.opentracing.contrib
+ opentracing-web-servlet-filter
+
+
+
+
+
+
+ src/main/resources
+ true
+
+
+
+
+ org.jacoco
+ jacoco-maven-plugin
+
+
+
+
+
diff --git a/oxalis-inbound/src/main/java/network/oxalis/inbound/DefaultInboundService.java b/oxalis-inbound/src/main/java/network/oxalis/inbound/DefaultInboundService.java
new file mode 100644
index 0000000000000000000000000000000000000000..92ef0912bb123af23b4068c6fff0f04c1383f33a
--- /dev/null
+++ b/oxalis-inbound/src/main/java/network/oxalis/inbound/DefaultInboundService.java
@@ -0,0 +1,27 @@
+package network.oxalis.inbound;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import network.oxalis.api.inbound.InboundMetadata;
+import network.oxalis.api.inbound.InboundService;
+import network.oxalis.api.statistics.StatisticsService;
+
+/**
+ * @author erlend
+ * @since 4.0.2
+ */
+@Singleton
+public class DefaultInboundService implements InboundService {
+
+ private StatisticsService statisticsService;
+
+ @Inject
+ public DefaultInboundService(StatisticsService statisticsService) {
+ this.statisticsService = statisticsService;
+ }
+
+ @Override
+ public void complete(InboundMetadata inboundMetadata) {
+ statisticsService.persist(inboundMetadata);
+ }
+}
diff --git a/oxalis-inbound/src/main/java/network/oxalis/inbound/InboundModule.java b/oxalis-inbound/src/main/java/network/oxalis/inbound/InboundModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..de29d5e578f27d6062af4205abfb692b01988dcc
--- /dev/null
+++ b/oxalis-inbound/src/main/java/network/oxalis/inbound/InboundModule.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.inbound;
+
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import com.google.inject.servlet.ServletModule;
+import io.opentracing.Tracer;
+import io.opentracing.contrib.web.servlet.filter.TracingFilter;
+import network.oxalis.api.inbound.InboundService;
+import network.oxalis.inbound.servlet.HomeServlet;
+import network.oxalis.inbound.servlet.StatusServlet;
+
+/**
+ * @author erlend
+ */
+public class InboundModule extends ServletModule {
+
+ @Override
+ protected void configureServlets() {
+ filter("/*").through(TracingFilter.class);
+
+ serve("/").with(HomeServlet.class);
+ serve("/status").with(StatusServlet.class);
+
+ bind(InboundService.class).to(DefaultInboundService.class);
+ }
+
+ @Provides
+ @Singleton
+ protected TracingFilter getTracingFilter(Tracer tracer) {
+ return new TracingFilter(tracer);
+ }
+}
diff --git a/oxalis-inbound/src/main/java/network/oxalis/inbound/OxalisGuiceContextListener.java b/oxalis-inbound/src/main/java/network/oxalis/inbound/OxalisGuiceContextListener.java
new file mode 100644
index 0000000000000000000000000000000000000000..76b0ad2af21b5d18ab906e413112dc49e26c4a68
--- /dev/null
+++ b/oxalis-inbound/src/main/java/network/oxalis/inbound/OxalisGuiceContextListener.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.inbound;
+
+import com.google.inject.Injector;
+import com.google.inject.servlet.GuiceServletContextListener;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+
+/**
+ * Wires our object graph together using Google Guice.
+ *
+ * @author steinar
+ * Date: 29.11.13
+ * Time: 10:26
+ * @author erlend
+ */
+@Slf4j
+public class OxalisGuiceContextListener extends GuiceServletContextListener {
+
+ private Injector injector;
+
+ public OxalisGuiceContextListener() {
+ try {
+ this.injector = GuiceModuleLoader.initiate();
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ throw new IllegalStateException(e.getMessage(), e);
+ }
+ }
+
+ public OxalisGuiceContextListener(Injector injector) {
+ this.injector = injector;
+ }
+
+ @Override
+ public Injector getInjector() {
+ return injector;
+ }
+}
diff --git a/oxalis-inbound/src/main/java/network/oxalis/inbound/servlet/HomeServlet.java b/oxalis-inbound/src/main/java/network/oxalis/inbound/servlet/HomeServlet.java
new file mode 100644
index 0000000000000000000000000000000000000000..fbcb16bd8dea5b57255b3869db25aec4a7653488
--- /dev/null
+++ b/oxalis-inbound/src/main/java/network/oxalis/inbound/servlet/HomeServlet.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.inbound.servlet;
+
+import com.google.inject.Singleton;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@Singleton
+public class HomeServlet extends HttpServlet {
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+ resp.setContentType("text/html;charset=UTF-8");
+ resp.getWriter().println("\n" +
+ "\n" +
+ " \n" +
+ " \n" +
+ " Oxalis PEPPOL server\n" +
+ " \n" +
+ " \n" +
+ " Welcome to the Oxalis PEPPOL server
\n" +
+ " The protocols for this Access Point are :
\n" +
+ " \n" +
+ " - The AS4 endpoint can be found here.
\n" +
+ "
\n" +
+ " Some status information can be found at status.
\n" +
+ " \n" +
+ "\n");
+ }
+}
diff --git a/oxalis-inbound/src/main/java/network/oxalis/inbound/servlet/StatusServlet.java b/oxalis-inbound/src/main/java/network/oxalis/inbound/servlet/StatusServlet.java
new file mode 100644
index 0000000000000000000000000000000000000000..4a292829c313e659da526b66e4b69220cbb82851
--- /dev/null
+++ b/oxalis-inbound/src/main/java/network/oxalis/inbound/servlet/StatusServlet.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.inbound.servlet;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import com.typesafe.config.Config;
+import network.oxalis.api.lang.OxalisLoadingException;
+import network.oxalis.commons.util.OxalisVersion;
+import network.oxalis.vefa.peppol.mode.Mode;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.security.cert.X509Certificate;
+import java.util.Date;
+import java.util.Properties;
+
+/**
+ * Servlet returning diagnostic information to ease operation, support and debugging.
+ * Since this servlet is public accessible, it should NOT contain any sensitive
+ * information about it's runtime environment.
+ *
+ * @author erlend
+ * @author thore
+ */
+@Singleton
+public class StatusServlet extends HttpServlet {
+
+ private final X509Certificate certificate;
+
+ private final Config config;
+
+ private final Mode mode;
+
+ @Inject
+ public StatusServlet(X509Certificate certificate, Config config, Mode mode) {
+ this.certificate = certificate;
+ this.mode = mode;
+ this.config = config;
+ }
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+ resp.setContentType("text/plain");
+
+ PrintWriter writer = resp.getWriter();
+ writer.println("version.oxalis: " + OxalisVersion.getVersion());
+ writer.println("version.java: " + System.getProperty("java.version"));
+ writer.println("mode: " + mode.getIdentifier());
+
+ if (config.hasPath("lookup.locator.hostname")) {
+ writer.print("lookup.locator.hostname: ");
+ writer.println(config.getString("lookup.locator.hostname"));
+ }
+
+ writer.println("certificate.subject: " + certificate.getSubjectX500Principal().getName());
+ writer.println("certificate.issuer: " + certificate.getIssuerX500Principal().getName());
+ writer.println("certificate.expired: " + certificate.getNotAfter().before(new Date()));
+ writer.println("build.id: " + OxalisVersion.getBuildId());
+ writer.println("build.tstamp: " + OxalisVersion.getBuildTimeStamp());
+ String as4id = "undefined";
+ String as4tstamp = "undefined";
+ try (InputStream inputStream = OxalisVersion.class.getResourceAsStream("/oxalis-as4-version.properties")) {
+ Properties properties = new Properties();
+ properties.load(inputStream);
+ as4id = properties.getProperty("as4.build.id");
+ as4tstamp = properties.getProperty("as4.build.tstamp");
+ } catch (Exception e) {
+ // probably not an as4 build...
+ }
+ writer.println("as4.build.id: " + as4id);
+ writer.println("as4.build.tstamp: " + as4tstamp);
+ }
+}
diff --git a/oxalis-inbound/src/main/resources/logback.xml b/oxalis-inbound/src/main/resources/logback.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a5a2f971f2ad609b1b82ea7561aebba61b0b9e9e
--- /dev/null
+++ b/oxalis-inbound/src/main/resources/logback.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+
+
+
+
+
+
+
+
+
+
diff --git a/oxalis-inbound/src/main/resources/reference.conf b/oxalis-inbound/src/main/resources/reference.conf
new file mode 100644
index 0000000000000000000000000000000000000000..89ebd547b6b133662bf820ba15f9e260d50ada00
--- /dev/null
+++ b/oxalis-inbound/src/main/resources/reference.conf
@@ -0,0 +1,4 @@
+oxalis.module.inbound.servlet.class = network.oxalis.inbound.InboundModule
+
+# This defaults is necessary as the code in ConfigModule looks for a defaults conf, but since we removed defaults from AS2, we need to add one here, so startup does not fail. From UAN-318 - Fjern AS2 protokollen fra Oxalis AP. AS2 no longer supported -->
+defaults.as2NotSupported=networkAS2NoLongerSupportedInOxalis
diff --git a/oxalis-inbound/src/test/java/network/oxalis/inbound/RunJettyServer.java b/oxalis-inbound/src/test/java/network/oxalis/inbound/RunJettyServer.java
new file mode 100644
index 0000000000000000000000000000000000000000..1ea45714b3e2d444e930363118c9d5ab2323eed7
--- /dev/null
+++ b/oxalis-inbound/src/test/java/network/oxalis/inbound/RunJettyServer.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.inbound;
+
+import com.google.inject.Injector;
+import network.oxalis.test.jetty.AbstractJettyServerTest;
+import org.testng.annotations.Test;
+
+public class RunJettyServer extends AbstractJettyServerTest {
+
+ @Override
+ public Injector getInjector() {
+ return new OxalisGuiceContextListener().getInjector();
+ }
+
+ @Test(groups = "manual", enabled = false)
+ public void runServer() throws Exception {
+ server.join();
+ }
+}
diff --git a/oxalis-inbound/src/test/java/network/oxalis/inbound/servlet/HomeServletTest.java b/oxalis-inbound/src/test/java/network/oxalis/inbound/servlet/HomeServletTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..6a9620a0d25c46b83953574a531ab26c51862ea0
--- /dev/null
+++ b/oxalis-inbound/src/test/java/network/oxalis/inbound/servlet/HomeServletTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.inbound.servlet;
+
+import com.google.inject.Injector;
+import network.oxalis.inbound.OxalisGuiceContextListener;
+import network.oxalis.test.jetty.AbstractJettyServerTest;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import javax.servlet.http.HttpServletResponse;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+@Test
+public class HomeServletTest extends AbstractJettyServerTest {
+
+ @Override
+ public Injector getInjector() {
+ return new OxalisGuiceContextListener().getInjector();
+ }
+
+ @Test
+ public void get() throws Exception {
+ HttpURLConnection httpURLConnection =
+ (HttpURLConnection) new URL("http://localhost:8080/").openConnection();
+
+ Assert.assertEquals(httpURLConnection.getResponseCode(), HttpServletResponse.SC_OK);
+ }
+
+ @Test
+ public void post() throws Exception {
+ HttpURLConnection httpURLConnection =
+ (HttpURLConnection) new URL("http://localhost:8080/").openConnection();
+ httpURLConnection.setRequestMethod("POST");
+
+ Assert.assertEquals(httpURLConnection.getResponseCode(), HttpServletResponse.SC_METHOD_NOT_ALLOWED);
+ }
+}
diff --git a/oxalis-inbound/src/test/java/network/oxalis/inbound/servlet/StatusServletTest.java b/oxalis-inbound/src/test/java/network/oxalis/inbound/servlet/StatusServletTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..6533dd654121e3039ff7f429fd2efcc2fdc34830
--- /dev/null
+++ b/oxalis-inbound/src/test/java/network/oxalis/inbound/servlet/StatusServletTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.inbound.servlet;
+
+import com.google.inject.Injector;
+import network.oxalis.inbound.OxalisGuiceContextListener;
+import network.oxalis.test.jetty.AbstractJettyServerTest;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import javax.servlet.http.HttpServletResponse;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+@Test
+public class StatusServletTest extends AbstractJettyServerTest {
+
+ @Override
+ public Injector getInjector() {
+ return new OxalisGuiceContextListener().getInjector();
+ }
+
+ @Test
+ public void get() throws Exception {
+ HttpURLConnection httpURLConnection =
+ (HttpURLConnection) new URL("http://localhost:8080/status").openConnection();
+
+ Assert.assertEquals(httpURLConnection.getResponseCode(), HttpServletResponse.SC_OK);
+ }
+
+ @Test
+ public void post() throws Exception {
+ HttpURLConnection httpURLConnection =
+ (HttpURLConnection) new URL("http://localhost:8080/status").openConnection();
+ httpURLConnection.setRequestMethod("POST");
+
+ Assert.assertEquals(httpURLConnection.getResponseCode(), HttpServletResponse.SC_METHOD_NOT_ALLOWED);
+ }
+}
diff --git a/oxalis-inbound/src/test/resources/logback-error.xml b/oxalis-inbound/src/test/resources/logback-error.xml
new file mode 100644
index 0000000000000000000000000000000000000000..83e8b6081b7383c5eb59fd83bb386dd17b6b5dd0
--- /dev/null
+++ b/oxalis-inbound/src/test/resources/logback-error.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+ %d %p [%c] %m %n
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oxalis-inbound/src/test/resources/logback-test.xml b/oxalis-inbound/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b383ba8b78ef9d01248d404b96d6ee25ce28e244
--- /dev/null
+++ b/oxalis-inbound/src/test/resources/logback-test.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+ %d %p [%c] %m %n
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oxalis-inbound/src/test/resources/logback-test2.xml b/oxalis-inbound/src/test/resources/logback-test2.xml
new file mode 100644
index 0000000000000000000000000000000000000000..83e8b6081b7383c5eb59fd83bb386dd17b6b5dd0
--- /dev/null
+++ b/oxalis-inbound/src/test/resources/logback-test2.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+ %d %p [%c] %m %n
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oxalis-inbound/src/test/resources/oxalis_home/fake-oxalis.conf b/oxalis-inbound/src/test/resources/oxalis_home/fake-oxalis.conf
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/oxalis-inbound/src/test/resources/oxalis_home/logback-test.xml b/oxalis-inbound/src/test/resources/oxalis_home/logback-test.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9ba0de5fc0e2ef9287cc084396a4efa80f319e31
--- /dev/null
+++ b/oxalis-inbound/src/test/resources/oxalis_home/logback-test.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+ %d %p [%c] %m %n
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oxalis-legacy/README.md b/oxalis-legacy/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..95256b9f904bad4300f4638df57b4cf637fb4121
--- /dev/null
+++ b/oxalis-legacy/README.md
@@ -0,0 +1,3 @@
+# Oxalis Legacy
+
+This folder contains modules provided for convenience even though they are not actively maintained.
\ No newline at end of file
diff --git a/oxalis-legacy/oxalis-document-sniffer/README.md b/oxalis-legacy/oxalis-document-sniffer/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..06f1c2d457c2ae4f40bca5876537a82d03a88541
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/README.md
@@ -0,0 +1,6 @@
+# Oxalis Document Sniffer (Legacy)
+
+This extension contains functionality provided to help users during introduction of SBDH in OpenPEPPOL.
+
+As the introduction of SBDH is completed, and quite some time has passed, this extension will not receive further updates.
+Users may expect this extension and its functionality to be removed from Oxalis as of version 4.2 or 5.0.
\ No newline at end of file
diff --git a/oxalis-legacy/oxalis-document-sniffer/doc/SchemeAndOrgId.puml b/oxalis-legacy/oxalis-document-sniffer/doc/SchemeAndOrgId.puml
new file mode 100644
index 0000000000000000000000000000000000000000..b65be405cf238e81f194e15a45763510dc679e8d
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/doc/SchemeAndOrgId.puml
@@ -0,0 +1,64 @@
+@startuml
+
+package vefa {
+ enum SchemeId {
+ schemeId : String
+ icd : String[4]
+
+ // To be overridden
+ String formatOrganisationId(String s)
+ --
+ {static}SchemeId: parse()
+ {static}SchemeId fromISO6523(String code)
+ }
+
+ class PeppolParticipantId {
+ String: Icd
+ String: OrgId
+ SchemeId: schmeId
+ .. Constructor ...
+ PeppolParticipantId(SchemeId s, OrgId o)
+ -- identical --
+ String: getOrganisationId()
+ String: stringValue()
+ --
+ {static}PeppolParticipantId: valueFor(String orgId) // xxxx:yyyy or Norwegian
+ {static}boolean: isValidNorwegianOrgNum(String orgNo)
+ -int: generateOrgNumModulus11(String s)
+ }
+
+ SchemeId --> PeppolParticipantId
+}
+
+package Oxalis {
+ enum Oxalis.SchemeId {
+ schemeId : String
+ icd : String[4]
+
+ // new
+ String formatOrganisationId(String s)
+ --
+ {static}SchemeId: parse()
+ {static}SchemeId fromISO6523(String code)
+ }
+
+ class ParticipantId {
+ String: value
+ .. Constructor ..
+ ParticipantId(String participantId)
+ -- Identical --
+ String: stringValue()
+ String: toString()
+ --
+ // Checks for :
+ {static} boolean isValidParticipantIdentifierSyntax()
+
+ // Verifies syntax and does mod-11 check for Norwegian organisation numbers
+ {static} boolean isValidParticipantIdentifier(String value)
+
+ {static} boolean isValidNorwegianOrganisationNumber(String org)
+ }
+
+ ParticipantId --> Oxalis.SchemeId
+}
+@enduml
\ No newline at end of file
diff --git a/oxalis-legacy/oxalis-document-sniffer/doc/sbdhparsing.puml b/oxalis-legacy/oxalis-document-sniffer/doc/sbdhparsing.puml
new file mode 100644
index 0000000000000000000000000000000000000000..bc2c143042c2fffa6d12fad73d29e681d88a4458
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/doc/sbdhparsing.puml
@@ -0,0 +1,35 @@
+@startuml
+start
+:sbdhFastParser.parse __parsedSbdh__ ;
+
+partition makeEffectiveSbdh {
+ :input parsedSBDH? and suppliedHeaderFields?;
+ if (isOverrideAllowed) then (Yes)
+ if (supplied sbdh is complete) then (Yes)
+ :use supplied sbdh;
+ else (No)
+ :parsePayloadAndDeduceSbdh
+ from business data;
+ :create effective header;
+ endif
+ else (No)
+ :parsePayloadAndDeduceSbdh:
+ convert parsedSBDH? to PeppolSBDH or parse payload;
+ :createEffectiveHeader;
+ endif
+}
+
+partition determineEndPoint {
+ if (endpoint supplied && override allowed) then (Yes)
+ :warning;
+ else
+ :perform SMP lookup;
+ :throw exception if override attempted;
+ endif
+}
+
+:wrap payload with SBDH using
+effective Sbdh;
+
+end
+@enduml
\ No newline at end of file
diff --git a/oxalis-legacy/oxalis-document-sniffer/pom.xml b/oxalis-legacy/oxalis-document-sniffer/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2bb6631400db653170d49ecbbdcf2254fed9df51
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/pom.xml
@@ -0,0 +1,61 @@
+
+
+
+
+
+ oxalis
+ dk.erst.oxalis
+ 0.9.0-e2f4121ccb55b5a60e6edebf7b28d277741d6789
+ ../../pom.xml
+
+ 4.0.0
+
+ oxalis-document-sniffer
+
+ Oxalis :: Leg :: Document Sniffer (Legacy)
+ Document sniffer used to generate SBDH for document types.
+ https://rep.erst.dk/git/openebusiness/nemhandeledelivery/oxalis
+
+
+ Erhvervsstyrelsen
+ https://nemhandel.dk/
+
+
+
+
+ dk.erst.oxalis
+ oxalis-commons
+ provided
+
+
+ dk.erst.oxalis
+ oxalis-test
+ test
+
+
+ network.oxalis.vefa
+ peppol-icd
+
+
+
+
\ No newline at end of file
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/PeppolStandardBusinessHeader.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/PeppolStandardBusinessHeader.java
new file mode 100644
index 0000000000000000000000000000000000000000..c4e4f3ba5e40ab9e4b0720dcffe9e6a7db24e4bd
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/PeppolStandardBusinessHeader.java
@@ -0,0 +1,215 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer;
+
+import network.oxalis.sniffer.identifier.InstanceId;
+import network.oxalis.sniffer.identifier.PeppolDocumentTypeId;
+import network.oxalis.vefa.peppol.common.model.*;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Our representation of the SBDH (Standard Business Document Header), which makes us
+ * independent of the StandardBusinessDocumentHeader generated by JAXB. Furthermore
+ * the UN/CEFACT SBDH is kind of awkward to use as some of the elements of interest to us,
+ * are split into several fields.
+ *
+ * @author steinar
+ * @author thore
+ */
+public class PeppolStandardBusinessHeader {
+
+ /**
+ * Peppol Participant Identification for the recipient
+ */
+ private ParticipantIdentifier recipientId;
+
+ /**
+ * Peppol Participant Identification for the sender
+ */
+ private ParticipantIdentifier senderId;
+
+ /**
+ * The type of document to send
+ */
+ private DocumentTypeIdentifier peppolDocumentTypeId;
+
+ /**
+ * The business process this document is a part of
+ */
+ private ProcessIdentifier profileTypeIdentifier;
+
+ /**
+ * Represents the unique identity of the message envelope. It is not the same as the ID of the
+ * business message (such as the Invoice number). Nor is it the same as the transmission Message ID
+ * generated by the application sending the message (as defined in AS2).
+ *
+ * This messageId is not the same as the "AS2 Message-ID" or the "START message id", which really are
+ * unique "transmission id's" that should be unique for each transmission.
+ *
+ * //StandardBusinessDocumentHeader/DocumentIdentification/InstanceIdentifier
+ */
+ private InstanceId instanceId;
+
+ private Date creationDateAndTime;
+
+ /**
+ * Set the time to current and makes a random TransmissionIdentifier as default
+ */
+ public static PeppolStandardBusinessHeader createPeppolStandardBusinessHeaderWithNewDate() {
+ PeppolStandardBusinessHeader p = new PeppolStandardBusinessHeader();
+ p.setCreationDateAndTime(new Date());
+ return p;
+ }
+
+ /**
+ * Empty constructor, no defaults - all must be supplied by user
+ */
+ public PeppolStandardBusinessHeader() {
+ /* intentionally nothing */
+ }
+
+ public PeppolStandardBusinessHeader(Header header) {
+ senderId = header.getSender();
+ recipientId = header.getReceiver();
+ creationDateAndTime = header.getCreationTimestamp();
+ peppolDocumentTypeId = header.getDocumentType();
+ profileTypeIdentifier = header.getProcess();
+ instanceId = new InstanceId(header.getIdentifier().getIdentifier());
+ }
+
+ /**
+ * Copy constructor
+ */
+ public PeppolStandardBusinessHeader(PeppolStandardBusinessHeader peppolStandardBusinessHeader) {
+ recipientId = peppolStandardBusinessHeader.getRecipientId();
+ senderId = peppolStandardBusinessHeader.getSenderId();
+ peppolDocumentTypeId = peppolStandardBusinessHeader.getDocumentTypeIdentifier();
+ profileTypeIdentifier = peppolStandardBusinessHeader.getProfileTypeIdentifier();
+ instanceId = peppolStandardBusinessHeader.getInstanceId();
+ creationDateAndTime = peppolStandardBusinessHeader.getCreationDateAndTime();
+ }
+
+ /**
+ * Do we have enough transport details to send the message?
+ *
+ * @return true if transport details are complete.
+ */
+ public boolean isComplete() {
+ return ((recipientId != null) &&
+ (senderId != null) &&
+ (peppolDocumentTypeId != null) &&
+ (profileTypeIdentifier != null) &&
+ (instanceId != null) &&
+ (creationDateAndTime != null));
+ }
+
+ /**
+ * Returns a list of property names that are still missing.
+ *
+ * @return empty list if headers are complete
+ */
+ public List listMissingProperties() {
+ List mhf = new ArrayList<>();
+ if (recipientId == null) mhf.add("recipientId");
+ if (senderId == null) mhf.add("senderId");
+ if (peppolDocumentTypeId == null) mhf.add("peppolDocumentTypeId");
+ if (profileTypeIdentifier == null) mhf.add("profileTypeIdentifier");
+ if (instanceId == null) mhf.add("messageId");
+ if (creationDateAndTime == null) mhf.add("creationDateAndTime");
+ return mhf;
+ }
+
+ public void setRecipientId(ParticipantIdentifier recipientId) {
+ this.recipientId = recipientId;
+ }
+
+ public ParticipantIdentifier getRecipientId() {
+ return recipientId;
+ }
+
+ public void setSenderId(ParticipantIdentifier senderId) {
+ this.senderId = senderId;
+ }
+
+ public ParticipantIdentifier getSenderId() {
+ return senderId;
+ }
+
+ public void setInstanceId(InstanceId instanceId) {
+ this.instanceId = instanceId;
+ }
+
+ public InstanceId getInstanceId() {
+ return instanceId;
+ }
+
+ public void setCreationDateAndTime(Date creationDateAndTime) {
+ this.creationDateAndTime = creationDateAndTime;
+ }
+
+ public Date getCreationDateAndTime() {
+ return creationDateAndTime;
+ }
+
+ @Deprecated
+ public void setDocumentTypeIdentifier(PeppolDocumentTypeId documentTypeIdentifier) {
+ setDocumentTypeIdentifier(documentTypeIdentifier.toVefa());
+ }
+
+ public void setDocumentTypeIdentifier(DocumentTypeIdentifier documentTypeIdentifier) {
+ this.peppolDocumentTypeId = documentTypeIdentifier;
+ }
+
+ public DocumentTypeIdentifier getDocumentTypeIdentifier() {
+ return peppolDocumentTypeId;
+ }
+
+ public void setProfileTypeIdentifier(ProcessIdentifier processIdentifier) {
+ this.profileTypeIdentifier = processIdentifier;
+ }
+
+ public ProcessIdentifier getProfileTypeIdentifier() {
+ return profileTypeIdentifier;
+ }
+
+ public Header toVefa() {
+ PeppolDocumentTypeId documentTypeId = PeppolDocumentTypeId.valueOf(peppolDocumentTypeId.getIdentifier());
+
+ return Header.of(
+ senderId,
+ recipientId,
+ profileTypeIdentifier,
+ peppolDocumentTypeId,
+ instanceId == null ? InstanceIdentifier.generateUUID() : instanceId.toVefa(),
+ InstanceType.of(
+ documentTypeId.getRootNameSpace(),
+ documentTypeId.getLocalName(),
+ documentTypeId.getVersion()
+ ),
+ creationDateAndTime
+ );
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/SnifferModule.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/SnifferModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..e207cd5529871c06adf9207052bb2776e77ded27
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/SnifferModule.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer;
+
+import network.oxalis.api.transformer.ContentDetector;
+import network.oxalis.commons.guice.OxalisModule;
+import network.oxalis.sniffer.document.NoSbdhParser;
+
+/**
+ * @author erlend
+ * @since 4.0.1
+ */
+public class SnifferModule extends OxalisModule {
+
+ @Override
+ protected void configure() {
+ bindTyped(ContentDetector.class, NoSbdhParser.class);
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/HardCodedNamespaceResolver.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/HardCodedNamespaceResolver.java
new file mode 100644
index 0000000000000000000000000000000000000000..f0bb791e31216e0ffc41390bb86d15371fd58366
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/HardCodedNamespaceResolver.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.document;
+
+import com.google.common.collect.ImmutableMap;
+
+import javax.xml.XMLConstants;
+import javax.xml.namespace.NamespaceContext;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * Namespace resolver hard coded for UBL based documents only.
+ *
+ * @author steinar
+ * @author thore
+ * @author erlend
+ */
+public class HardCodedNamespaceResolver implements NamespaceContext {
+
+ private static final Map NAMESPACE_MAP = ImmutableMap.builder()
+ .put("xsi", "http://www.w3.org/2001/XMLSchema-instance")
+ .put("cac", "urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2")
+ .put("cbc", "urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2")
+ .put("ext", "urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2")
+ .build();
+
+ @Override
+ public String getNamespaceURI(String prefix) {
+ if (prefix == null) {
+ throw new IllegalArgumentException("No prefix provided!");
+ }
+ String uri = NAMESPACE_MAP.get(prefix);
+ if (uri == null) {
+ return XMLConstants.NULL_NS_URI;
+ } else {
+ return uri;
+ }
+ }
+
+ @Override
+ public String getPrefix(String namespaceURI) {
+ // Not needed in this context.
+ return null;
+ }
+
+ @Override
+ public Iterator getPrefixes(String namespaceURI) {
+ // Not needed in this context.
+ return null;
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/NoSbdhParser.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/NoSbdhParser.java
new file mode 100644
index 0000000000000000000000000000000000000000..61c4937b88f2107ecad3134d9f2d66ab24f26120
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/NoSbdhParser.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.document;
+
+import com.google.inject.Singleton;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.api.lang.OxalisContentException;
+import network.oxalis.api.transformer.ContentDetector;
+import network.oxalis.api.util.Type;
+import network.oxalis.sniffer.PeppolStandardBusinessHeader;
+import network.oxalis.sniffer.document.parsers.PEPPOLDocumentParser;
+import network.oxalis.vefa.peppol.common.model.Header;
+import org.w3c.dom.Document;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathFactory;
+import java.io.InputStream;
+
+/**
+ * Parses UBL based documents, which are not wrapped within an SBDH, extracting data and
+ * creating a PeppolStandardBusinessHeader.
+ *
+ * @author steinar
+ * @author thore
+ */
+@Slf4j
+@Singleton
+@Type("legacy")
+public class NoSbdhParser implements ContentDetector {
+
+ private static final DocumentBuilderFactory documentBuilderFactory;
+
+ static {
+ documentBuilderFactory = DocumentBuilderFactory.newInstance();
+ documentBuilderFactory.setNamespaceAware(true);
+
+ try {
+ documentBuilderFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+ } catch (ParserConfigurationException e) {
+ throw new IllegalStateException("Unable to configure DOM parser for secure processing.", e);
+ }
+ }
+
+ public NoSbdhParser() {
+ log.warn("You have enabled support for automatic detection of content. " +
+ "This functionality will be turned of by default in version 4.1 and removed in version 4.2/5.0. " +
+ "Use configuration \"oxalis.transformer.detector = noop\" to disable it today.");
+ }
+
+ /**
+ * Parses and extracts the data needed to create a PeppolStandardBusinessHeader object. The inputstream supplied
+ * should not be wrapped in an SBDH.
+ *
+ * @param inputStream UBL XML data without an SBDH.
+ * @return an instance of Header populated with data from the UBL XML document.
+ */
+ @Override
+ public Header parse(InputStream inputStream) throws OxalisContentException {
+ return originalParse(inputStream).toVefa();
+ }
+
+ /**
+ * Parses and extracts the data needed to create a PeppolStandardBusinessHeader object. The inputstream supplied
+ * should not be wrapped in an SBDH.
+ *
+ * @param inputStream UBL XML data without an SBDH.
+ * @return an instance of PeppolStandardBusinessHeader populated with data from the UBL XML document.
+ */
+ public PeppolStandardBusinessHeader originalParse(InputStream inputStream) throws OxalisContentException {
+ try {
+
+ DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
+ Document document = documentBuilder.parse(inputStream);
+
+ XPath xPath = XPathFactory.newInstance().newXPath();
+ xPath.setNamespaceContext(new HardCodedNamespaceResolver());
+
+ PeppolStandardBusinessHeader sbdh = PeppolStandardBusinessHeader
+ .createPeppolStandardBusinessHeaderWithNewDate();
+
+ // use the plain UBL header parser to decode format and create correct document parser
+ PlainUBLHeaderParser headerParser = new PlainUBLHeaderParser(document, xPath);
+
+ // make sure we actually have a UBL type document
+ if (headerParser.canParse()) {
+
+ sbdh.setDocumentTypeIdentifier(headerParser.fetchDocumentTypeId().toVefa());
+ sbdh.setProfileTypeIdentifier(headerParser.fetchProcessTypeId());
+
+ // try to use a specialized document parser to fetch more document details
+ PEPPOLDocumentParser documentParser = null;
+ try {
+ documentParser = headerParser.createDocumentParser();
+ } catch (Exception ex) {
+ /*
+ allow this to happen so that "unknown" PEPPOL documents still
+ can be used by explicitly setting sender and receiver thru API
+ */
+ }
+ /* However, if we found an eligible parser, we should be able to determine the sender and receiver */
+ if (documentParser != null) {
+ try {
+ sbdh.setSenderId(documentParser.getSender());
+ } catch (Exception e) {
+ // Continue with recipient
+ }
+ try {
+ sbdh.setRecipientId(documentParser.getReceiver());
+ } catch (Exception e) {
+ // Just continue
+ }
+ }
+ }
+
+ return sbdh;
+ } catch (Exception e) {
+ throw new OxalisContentException("Unable to parseOld document " + e.getMessage(), e);
+ }
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/PlainUBLHeaderParser.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/PlainUBLHeaderParser.java
new file mode 100644
index 0000000000000000000000000000000000000000..f8c51a98cf2cebd81f2f02e5225d54d0f5b22219
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/PlainUBLHeaderParser.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.document;
+
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.sniffer.document.parsers.*;
+import network.oxalis.sniffer.identifier.CustomizationIdentifier;
+import network.oxalis.sniffer.identifier.PeppolDocumentTypeId;
+import network.oxalis.vefa.peppol.common.model.ProcessIdentifier;
+import org.w3c.dom.Document;
+
+import javax.xml.xpath.XPath;
+
+/**
+ * Parses the common PEPPOL header information, enough to decide document type and profile
+ *
+ * @author steinar
+ * @author thore
+ * @author arun
+ */
+@Slf4j
+public class PlainUBLHeaderParser extends PlainUBLParser {
+
+ public PlainUBLHeaderParser(Document document, XPath xPath) {
+ super(document, xPath);
+ }
+
+ public CustomizationIdentifier fetchCustomizationId() {
+ String value = retriveValueForXpath("//cbc:CustomizationID");
+ return CustomizationIdentifier.valueOf(value);
+ }
+
+ public ProcessIdentifier fetchProcessTypeId() {
+ String value = retriveValueForXpath("//cbc:ProfileID");
+ return ProcessIdentifier.of(value);
+ }
+
+ public PeppolDocumentTypeId fetchDocumentTypeId() {
+ CustomizationIdentifier customizationIdentifier = fetchCustomizationId();
+ return new PeppolDocumentTypeId(rootNameSpace(), localName(), customizationIdentifier, ublVersion());
+ }
+
+ public PEPPOLDocumentParser createDocumentParser() {
+ String type = localName();
+ log.debug("Creating DocumentParser for type : " + localName());
+ // despatch advice scenario
+ if ("DespatchAdvice".equalsIgnoreCase(type)) return new DespatchAdviceDocumentParser(this);
+ // catalogue scenario
+ if ("Catalogue".equalsIgnoreCase(type)) return new CatalogueDocumentParser(this);
+ // invoice scenario
+ if ("CreditNote".equalsIgnoreCase(type)) return new InvoiceDocumentParser(this);
+ if ("Invoice".equalsIgnoreCase(type)) return new InvoiceDocumentParser(this);
+ if ("Reminder".equalsIgnoreCase(type)) return new InvoiceDocumentParser(this);
+ // order scenario
+ if ("Order".equalsIgnoreCase(type)) return new OrderDocumentParser(this);
+ if ("OrderResponse".equalsIgnoreCase(type)) return new OrderDocumentParser(this);
+ if ("OrderResponseSimple".equalsIgnoreCase(type)) return new OrderDocumentParser(this);
+ // application response used by CatalogueResponse, MessageLevelResponse
+ if ("ApplicationResponse".equalsIgnoreCase(type)) return new ApplicationResponseDocumentParser(this);
+ // unknown scenario - for now we do not have a backup plan
+ throw new IllegalStateException("Cannot decide which PEPPOLDocumentParser to use for type " + type);
+ }
+
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/PlainUBLParser.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/PlainUBLParser.java
new file mode 100644
index 0000000000000000000000000000000000000000..85224d18428ebb6343ebdc4647f92e891a3f28d3
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/PlainUBLParser.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.document;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+
+/**
+ * Simple parser that is UBL aware and handles xpath with namespaces.
+ *
+ * @author thore
+ */
+public class PlainUBLParser {
+
+ private final Document document;
+
+ private final XPath xPath;
+
+ public PlainUBLParser(Document document, XPath xPath) {
+ this.document = document;
+ this.xPath = xPath;
+ }
+
+ public String localName() {
+ return document.getDocumentElement().getLocalName();
+ }
+
+ public String rootNameSpace() {
+ return document.getDocumentElement().getNamespaceURI();
+ }
+
+ public String ublVersion() {
+ return retriveValueForXpath("//cbc:UBLVersionID");
+ }
+
+ public boolean canParse() {
+ return ("" + rootNameSpace()).startsWith("urn:oasis:names:specification:ubl:schema:xsd:");
+ }
+
+ public Element retrieveElementForXpath(String s) {
+ try {
+ Element element = (Element) xPath.evaluate(s, document, XPathConstants.NODE);
+ if (element == null) {
+ throw new IllegalStateException("No element in XPath: " + s);
+ }
+ return element;
+ } catch (XPathExpressionException e) {
+ throw new IllegalStateException("Unable to evaluate " + s + "; " + e.getMessage(), e);
+ }
+ }
+
+ public String retriveValueForXpath(String s) {
+ try {
+ String value = xPath.evaluate(s, document);
+ if (value == null) {
+ throw new IllegalStateException("Unable to find value for Xpath expr " + s);
+ }
+ return value.trim();
+ } catch (XPathExpressionException e) {
+ throw new IllegalStateException("Unable to evaluate " + s + "; " + e.getMessage(), e);
+ }
+ }
+
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/AbstractDocumentParser.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/AbstractDocumentParser.java
new file mode 100644
index 0000000000000000000000000000000000000000..9a7587b07e9f3dc56fdbe3c59d5b601142ff8403
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/AbstractDocumentParser.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.document.parsers;
+
+import network.oxalis.sniffer.document.PlainUBLParser;
+import network.oxalis.sniffer.identifier.ParticipantId;
+import network.oxalis.sniffer.identifier.SchemeId;
+import network.oxalis.vefa.peppol.common.model.ParticipantIdentifier;
+import org.w3c.dom.Element;
+
+/**
+ * Abstract implementation based on the PlainUBLParser to retrieve information from PEPPOL documents.
+ * Contains common functionality to be used as a base for decoding types.
+ *
+ * @author thore
+ */
+public abstract class AbstractDocumentParser implements PEPPOLDocumentParser {
+
+ protected PlainUBLParser parser;
+
+ public AbstractDocumentParser(PlainUBLParser parser) {
+ this.parser = parser;
+ }
+
+ /**
+ * Retrieves the ParticipantId which is retrieved using the supplied XPath.
+ */
+ protected ParticipantIdentifier participantId(String xPathExpr) {
+ ParticipantId ret;
+
+ // first we retrieve the correct participant element
+ Element element;
+ try {
+ element = parser.retrieveElementForXpath(xPathExpr);
+ } catch (Exception ex) {
+ // DOM parser throws "java.lang.IllegalStateException: No element in XPath: ..." if no Element is found
+ throw new IllegalStateException(String.format("No ParticipantId found at '%s'.", xPathExpr));
+ }
+
+ // get value and any schemeId given
+ String companyId = element.getFirstChild().getNodeValue().trim();
+ String schemeIdTextValue = element.getAttribute("schemeID").trim();
+
+ // check if we already have a valid participant 9908:987654321
+ if (ParticipantId.isValidParticipantIdentifierPattern(companyId)) {
+ if (schemeIdTextValue.length() == 0) {
+ // we accept participants with icd prefix if schemeId is missing ...
+ ret = new ParticipantId(companyId);
+ } else {
+ // ... or when given schemeId matches the icd code stat eg NO:VAT matches 9908 from 9908:987654321
+ if (companyId.startsWith(SchemeId.parse(schemeIdTextValue).getCode() + ":")) {
+ ret = new ParticipantId(companyId);
+ } else {
+ throw new IllegalStateException(String.format(
+ "ParticipantId at '%s' is illegal, schemeId '%s' and icd code prefix of '%s' does not match",
+ xPathExpr, schemeIdTextValue, companyId));
+ }
+ }
+ } else {
+ // try to add the given icd prefix to the participant id
+ companyId = String.format("%s:%s", SchemeId.parse(schemeIdTextValue).getCode(), companyId);
+ if (!ParticipantId.isValidParticipantIdentifierPattern(companyId)) {
+ throw new IllegalStateException(String.format(
+ "ParticipantId syntax at '%s' evaluates to '%s' and is invalid", xPathExpr, companyId));
+ }
+ ret = new ParticipantId(companyId);
+ }
+ return ret.toVefa();
+ }
+
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/ApplicationResponseDocumentParser.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/ApplicationResponseDocumentParser.java
new file mode 100644
index 0000000000000000000000000000000000000000..b06436e7cd4f09eb2b9e8efb9ed856c7cbdc2531
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/ApplicationResponseDocumentParser.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.document.parsers;
+
+import network.oxalis.sniffer.document.PlainUBLParser;
+import network.oxalis.vefa.peppol.common.model.ParticipantIdentifier;
+
+/**
+ * Parser to retrieves information from PEPPOL Application Response documents.
+ * Should be able to decode Catalogue Response, Message Level Response and others based on ApplicationResponse
+ *
+ * @author thore
+ */
+public class ApplicationResponseDocumentParser extends AbstractDocumentParser {
+
+ public ApplicationResponseDocumentParser(PlainUBLParser parser) {
+ super(parser);
+ }
+
+ @Override
+ public ParticipantIdentifier getSender() {
+ String applicationResponse = "//cac:SenderParty/cbc:EndpointID";
+ return participantId(applicationResponse);
+ }
+
+ @Override
+ public ParticipantIdentifier getReceiver() {
+ String applicationResponse = "//cac:ReceiverParty/cbc:EndpointID";
+ return participantId(applicationResponse);
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/CatalogueDocumentParser.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/CatalogueDocumentParser.java
new file mode 100644
index 0000000000000000000000000000000000000000..7b77d39b35d76dde437bec8e28d51b7407baa0ec
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/CatalogueDocumentParser.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.document.parsers;
+
+import network.oxalis.sniffer.document.PlainUBLParser;
+import network.oxalis.vefa.peppol.common.model.ParticipantIdentifier;
+
+/**
+ * Parser to retrieves information from PEPPOL Catalogue scenarios.
+ * Should be able to decode Catalogue (for catalogue response see ApplicationResponse)
+ *
+ * @author thore
+ */
+public class CatalogueDocumentParser extends AbstractDocumentParser {
+
+ public CatalogueDocumentParser(PlainUBLParser parser) {
+ super(parser);
+ }
+
+ @Override
+ public ParticipantIdentifier getSender() {
+ String catalogue = "//cac:ProviderParty/cbc:EndpointID";
+ return participantId(catalogue);
+ }
+
+ @Override
+ public ParticipantIdentifier getReceiver() {
+ String catalogue = "//cac:ReceiverParty/cbc:EndpointID";
+ return participantId(catalogue);
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/DespatchAdviceDocumentParser.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/DespatchAdviceDocumentParser.java
new file mode 100644
index 0000000000000000000000000000000000000000..1b0400f0879e88f35c104050f1d639941fb3433d
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/DespatchAdviceDocumentParser.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.document.parsers;
+
+import network.oxalis.sniffer.document.PlainUBLParser;
+import network.oxalis.vefa.peppol.common.model.ParticipantIdentifier;
+
+/**
+ * Parser to retrieves information from PEPPOL Despatch Advice scenarios.
+ * Should be able to decode Despatch Advice document
+ *
+ * @author thore
+ */
+public class DespatchAdviceDocumentParser extends AbstractDocumentParser {
+
+ public DespatchAdviceDocumentParser(PlainUBLParser parser) {
+ super(parser);
+ }
+
+ @Override
+ public ParticipantIdentifier getSender() {
+ String despatchAdvice = "//cac:DespatchSupplierParty/cac:Party/cbc:EndpointID";
+ return participantId(despatchAdvice);
+ }
+
+ @Override
+ public ParticipantIdentifier getReceiver() {
+ String despatchAdvice = "//cac:DeliveryCustomerParty/cac:Party/cbc:EndpointID";
+ return participantId(despatchAdvice);
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/InvoiceDocumentParser.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/InvoiceDocumentParser.java
new file mode 100644
index 0000000000000000000000000000000000000000..3786a6433b796a623c85d21eef4df84dcb3e06b7
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/InvoiceDocumentParser.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.document.parsers;
+
+import network.oxalis.sniffer.document.PlainUBLParser;
+import network.oxalis.vefa.peppol.common.model.ParticipantIdentifier;
+
+/**
+ * Parser to retrieves information from PEPPOL Invoice scenarios.
+ * Should be able to decode Invoices in plain UBL and Norwegian EHF variants.
+ *
+ * @author thore
+ */
+public class InvoiceDocumentParser extends AbstractDocumentParser {
+
+ public InvoiceDocumentParser(PlainUBLParser parser) {
+ super(parser);
+ }
+
+ @Override
+ public ParticipantIdentifier getSender() {
+ String endpointFirst = "//cac:AccountingSupplierParty/cac:Party/cbc:EndpointID";
+ String companySecond = "//cac:AccountingSupplierParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID";
+ ParticipantIdentifier s;
+ try {
+ s = participantId(endpointFirst);
+ } catch (IllegalStateException e) {
+ s = participantId(companySecond);
+ }
+ return s;
+ }
+
+ @Override
+ public ParticipantIdentifier getReceiver() {
+ String endpointFirst = "//cac:AccountingCustomerParty/cac:Party/cbc:EndpointID";
+ String companySecond = "//cac:AccountingCustomerParty/cac:Party/cac:PartyLegalEntity/cbc:CompanyID";
+ ParticipantIdentifier s;
+ try {
+ s = participantId(endpointFirst);
+ } catch (IllegalStateException e) {
+ s = participantId(companySecond);
+ }
+ return s;
+ }
+
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/OrderDocumentParser.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/OrderDocumentParser.java
new file mode 100644
index 0000000000000000000000000000000000000000..0df71271c919e300b0d89b852a49e7a9a33cb752
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/OrderDocumentParser.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.document.parsers;
+
+import network.oxalis.sniffer.document.PlainUBLParser;
+import network.oxalis.vefa.peppol.common.model.ParticipantIdentifier;
+
+/**
+ * Parser to retrieves information from PEPPOL Order scenarios.
+ * Should be able to decode Order and OrderResponse documents.
+ *
+ * @author thore
+ */
+public class OrderDocumentParser extends AbstractDocumentParser {
+
+ public OrderDocumentParser(PlainUBLParser parser) {
+ super(parser);
+ }
+
+ @Override
+ public ParticipantIdentifier getSender() {
+ String xpath = "//cac:BuyerCustomerParty/cac:Party/cbc:EndpointID";
+ if (parser.localName().startsWith("OrderResponse")) {
+ // Matches both OrderResponse and OrderResponseSimple
+ xpath = "//cac:SellerSupplierParty/cac:Party/cbc:EndpointID";
+ }
+ return participantId(xpath);
+ }
+
+ @Override
+ public ParticipantIdentifier getReceiver() {
+ String xpath = "//cac:SellerSupplierParty/cac:Party/cbc:EndpointID";
+ if (parser.localName().startsWith("OrderResponse")) {
+ // Matches both OrderResponse and OrderResponseSimple
+ xpath = "//cac:BuyerCustomerParty/cac:Party/cbc:EndpointID";
+ }
+ return participantId(xpath);
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/PEPPOLDocumentParser.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/PEPPOLDocumentParser.java
new file mode 100644
index 0000000000000000000000000000000000000000..69be72617203ee727a9163a70643b60574a9d778
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/document/parsers/PEPPOLDocumentParser.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.document.parsers;
+
+import network.oxalis.vefa.peppol.common.model.ParticipantIdentifier;
+
+/**
+ * A small set of common information we should be able to retrieve from any PEPPOL UBL/EHF document.
+ *
+ * @author thore
+ */
+public interface PEPPOLDocumentParser {
+
+ /**
+ * Identify and return the PEPPOL participant sending the document.
+ */
+ ParticipantIdentifier getSender();
+
+ /**
+ * Identify and return the PEPPOL participant receiving the document.
+ */
+ ParticipantIdentifier getReceiver();
+
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/identifier/CustomizationIdentifier.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/identifier/CustomizationIdentifier.java
new file mode 100644
index 0000000000000000000000000000000000000000..3d1d21c3562f615467aee729f7da131c9308b28e
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/identifier/CustomizationIdentifier.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.identifier;
+
+import java.io.Serializable;
+
+/**
+ * Represents a PEPPOL Customization Identifier contained within a PEPPOL Document Identifier.
+ *
+ * @author Steinar Overbeck Cook steinar@sendregning.no
+ * @author Thore Johnsen thore@sendregning.no
+ *
+ * @see "PEPPOL Policy for use of identifiers v3.0 of 2014-02-03"
+ */
+public class CustomizationIdentifier implements Serializable {
+
+ private String value;
+
+ public CustomizationIdentifier(String customizationIdentifier) {
+ if (customizationIdentifier != null) customizationIdentifier = customizationIdentifier.trim();
+ this.value = customizationIdentifier;
+ }
+
+ public static CustomizationIdentifier valueOf(String s) {
+ return new CustomizationIdentifier(s);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ CustomizationIdentifier that = (CustomizationIdentifier) o;
+ return value.equals(that.value);
+ }
+
+ @Override
+ public int hashCode() {
+ return value.hashCode();
+ }
+
+ @Override
+ public String toString() {
+ return value;
+ }
+
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/identifier/InstanceId.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/identifier/InstanceId.java
new file mode 100644
index 0000000000000000000000000000000000000000..3110e5c7c59b5c14a586ac5ac60cb24beb9e5e63
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/identifier/InstanceId.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.identifier;
+
+import network.oxalis.vefa.peppol.common.model.InstanceIdentifier;
+
+import java.util.UUID;
+
+/**
+ * Represents the Instance Identifier used in the SBDH.
+ *
+ * @author steinar
+ * Date: 21.11.2016
+ * Time: 09.22
+ */
+public class InstanceId implements java.io.Serializable {
+
+
+ private final String value;
+
+ /** Creates new InstanceId with random UUID */
+ public InstanceId() {
+ value = UUID.randomUUID().toString();
+ }
+
+ /** Creates new InstanceId with supplied value */
+ public InstanceId(String value) {
+ this.value = value;
+ }
+
+
+ @Override
+ public String toString() {
+ return value;
+ }
+
+ public InstanceId valueOf(String value) {
+ return new InstanceId(value);
+ }
+
+ public InstanceIdentifier toVefa() {
+ return InstanceIdentifier.of(value);
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/identifier/ParticipantId.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/identifier/ParticipantId.java
new file mode 100644
index 0000000000000000000000000000000000000000..19de83748746d824f35beeb4f8fe341a673d9986
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/identifier/ParticipantId.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.identifier;
+
+import network.oxalis.sniffer.lang.InvalidPeppolParticipantException;
+import network.oxalis.vefa.peppol.common.model.ParticipantIdentifier;
+import network.oxalis.vefa.peppol.icd.api.Icd;
+
+import java.io.Serializable;
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author Steinar Overbeck Cook
+ * @author Thore Johnsen
+ * @see SchemeId
+ */
+public class ParticipantId implements Serializable {
+
+ private static final Pattern ISO6523_PATTERN = Pattern.compile("^(\\d{4}):([^\\s]+)$");
+
+ //max length for international organisation number
+ private static final int INTERNATION_ORG_ID_MAX_LENGTH = 50;
+
+ // Holds the textual representation of this PEPPOL participant id
+ private final String value;
+
+ /**
+ * Constructs a new instance based upon a match of the following patterns :
+ *
+ * - {@code xxxx:yyyyyy} - i.e. a 4 digit ICD followed by a ':' followed by the organisationID
+ * - AB999999999 - i.e. a prefix of at least two characters followed by something
+ *
+ *
+ * @param participantId participant Id represented as a string
+ * @throws InvalidPeppolParticipantException if we are unable to recognize the input as a PEPPOL participant ID
+ */
+ public ParticipantId(String participantId) {
+ value = parse(participantId);
+ }
+
+ /**
+ * Uses combination of SchemeId and Organisation identifier to create new instance.
+ * The Organisation identifier is validated in accordance with the rules of the scheme.
+ *
+ * @param schemeId
+ * @param organisationId
+ */
+ public ParticipantId(final Icd schemeId, final String organisationId) {
+
+ if (schemeId == null) {
+ throw new IllegalArgumentException("SchemeId must be specified with a a valid ISO6523 code.");
+ }
+
+ if (organisationId == null) {
+ throw new IllegalArgumentException("The organisation id must be specified.");
+ }
+
+ if (organisationId.length() > INTERNATION_ORG_ID_MAX_LENGTH) {
+ throw new IllegalArgumentException(String.format(
+ "Invalid organisation id. '%s' is longer than %d characters"
+ , organisationId, INTERNATION_ORG_ID_MAX_LENGTH));
+ }
+
+ // Formats the organisation identifier in accordance with what PEPPOL expects.
+ value = String.format("%s:%s", schemeId.getCode(), organisationId);
+ }
+
+ /**
+ * Parses the input string assuming it represents an organisation number or PEPPOL participant identifier in one
+ * of these forms:
+ *
+ * - icd +':' + organisation identifier
+ * - National organisation number with at least two character prefix.
+ *
+ *
+ * After parsing, the organisation identifier is validated in accordance with the rules of the scheme a
+ * validator is found.
+ *
+ *
+ * @param participantId the string representing the participant identifier or organisation identifier
+ * @return a string on the form [ISO6523 ICD]:[participantId];
+ */
+ static String parse(final String participantId) throws InvalidPeppolParticipantException {
+ String organisationId = participantId.trim().replaceAll("\\s", ""); // Squeezes out any white spaces
+ Icd schemeId = null;
+
+ Matcher matcher = ISO6523_PATTERN.matcher(organisationId);
+
+ if (!matcher.matches())
+ throw new InvalidPeppolParticipantException(String.format("ICD not found in '%s'.", participantId));
+
+ // If the representation is in the form xxxx:yyyyyyyyy, we are good
+ String icd = matcher.group(1);
+ organisationId = matcher.group(2);
+
+ try {
+ schemeId = SchemeId.fromISO6523(icd); // Locates the associated scheme
+ } catch (IllegalArgumentException e) {
+ // No action.
+ }
+
+ if (schemeId == null)
+ throw new InvalidPeppolParticipantException("ICD " + icd + " is unknown");
+
+ // Constructs the textual representation of the PEPPOL participant identifier
+ return String.format("%s:%s", schemeId.getCode(), organisationId);
+ }
+
+
+ /**
+ * Parses the provided participant identifier into a validated instance
+ * of {@link ParticipantId}
+ *
+ * @param participantId The organisation number as xxxx:yyyy or just an organisation number
+ * @return validated instance of Participant Id
+ */
+ public static ParticipantId valueOf(String participantId) {
+ return new ParticipantId(parse(participantId.trim()));
+
+ }
+
+ /**
+ * Simple syntax verifier, verifies icd prefix + code
+ */
+ public static boolean isValidParticipantIdentifierPattern(String value) {
+ if (value == null) return false;
+
+ Matcher matcher = ISO6523_PATTERN.matcher(value);
+ return matcher.find();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ ParticipantId that = (ParticipantId) o;
+ return Objects.equals(value, that.value);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(value);
+ }
+
+ @Override
+ public String toString() {
+ return value;
+ }
+
+ public ParticipantIdentifier toVefa() {
+ return ParticipantIdentifier.of(value, ParticipantIdentifier.DEFAULT_SCHEME);
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/identifier/PeppolDocumentTypeId.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/identifier/PeppolDocumentTypeId.java
new file mode 100644
index 0000000000000000000000000000000000000000..4cd0c6f3e651206bebc96c4e75a93311c356603c
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/identifier/PeppolDocumentTypeId.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.identifier;
+
+import network.oxalis.vefa.peppol.common.model.DocumentTypeIdentifier;
+
+import java.io.Serializable;
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Represents a type safe PEPPOL Document Identifier, textually represented thus:
+ *
+ *
+ * {@literal ::##::}
+ *
+ *
+ * @author Steinar Overbeck Cook
+ * @author Thore Johnsen
+ * @see "PEPPOL Policy for use of identifiers v3.0 of 2014-02-03"
+ */
+public class PeppolDocumentTypeId implements Serializable {
+
+ private final String rootNameSpace;
+
+ private final String localName;
+
+ private final CustomizationIdentifier customizationIdentifier;
+
+ private final String version;
+
+ /**
+ *
+ * <root NS>::<document element local name>##<customization id>::<version>
+ *
+ */
+ static Pattern documentIdPattern = Pattern.compile("(.*)::(.*)##(.*)::(.*)");
+
+ public PeppolDocumentTypeId(String rootNameSpace, String localName,
+ CustomizationIdentifier customizationIdentifier, String version) {
+ this.rootNameSpace = rootNameSpace;
+ this.localName = localName;
+ this.customizationIdentifier = customizationIdentifier;
+ this.version = version;
+ }
+
+ /**
+ * Parses the supplied text string into the separate components of a PEPPOL Document Identifier.
+ *
+ * @param documentIdAsText textual representation of a document identifier.
+ * @return type safe instance of DocumentTypeIdentifier
+ */
+ public static PeppolDocumentTypeId valueOf(String documentIdAsText) {
+ if (documentIdAsText == null)
+ throw new NullPointerException("Value 'null' is not a valid document type identifier.");
+
+ Matcher matcher = documentIdPattern.matcher(documentIdAsText.trim());
+ if (matcher.matches()) {
+ String rootNameSpace = matcher.group(1);
+ String localName = matcher.group(2);
+ String customizationIdAsText = matcher.group(3);
+ String version = matcher.group(4);
+ CustomizationIdentifier customizationIdentifier = CustomizationIdentifier.valueOf(customizationIdAsText);
+ return new PeppolDocumentTypeId(rootNameSpace, localName, customizationIdentifier, version);
+ } else
+ throw new IllegalArgumentException(
+ String.format("Unable to parseOld '%s' into PEPPOL Document Type Identifier", documentIdAsText));
+ }
+
+ /**
+ * Provides a textual representation of this document type identifier
+ *
+ * @return textual value.
+ */
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append(rootNameSpace);
+ sb.append("::").append(localName);
+ sb.append("##").append(customizationIdentifier);
+ sb.append("::").append(version);
+ return sb.toString();
+ }
+
+ public String getRootNameSpace() {
+ return rootNameSpace;
+ }
+
+ public String getLocalName() {
+ return localName;
+ }
+
+ public CustomizationIdentifier getCustomizationIdentifier() {
+ return customizationIdentifier;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ PeppolDocumentTypeId that = (PeppolDocumentTypeId) o;
+ return Objects.equals(rootNameSpace, that.rootNameSpace) &&
+ Objects.equals(localName, that.localName) &&
+ Objects.equals(customizationIdentifier, that.customizationIdentifier) &&
+ Objects.equals(version, that.version);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(rootNameSpace, localName, customizationIdentifier, version);
+ }
+
+ public DocumentTypeIdentifier toVefa() {
+ return DocumentTypeIdentifier.of(toString());
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/identifier/SchemeId.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/identifier/SchemeId.java
new file mode 100644
index 0000000000000000000000000000000000000000..8ca5efecb36ec9ff89423a00addf23facf59bb88
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/identifier/SchemeId.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.identifier;
+
+import network.oxalis.vefa.peppol.icd.Icds;
+import network.oxalis.vefa.peppol.icd.api.Icd;
+import network.oxalis.vefa.peppol.icd.code.PeppolIcd;
+
+/**
+ * Provides a binding between the attributes schemeAgencyId and the corresponding ISO6523 prefix (ICD).
+ * The ENUM is taken from Policy for use of Identifiers version 3.0 dated 2014-02-03.
+ * The ICD's should be 4 digits, a list can be found : http://www.oid-info.com/doc/ICD-list.pdf
+ *
+ * Possible improvements are:
+ *
+ * - Add an attribute with the literal prefix of the organisation identifiers for each scheme.
+ * This would make it easier to identify which scheme an organisation identifier belongs to. This could be
+ * combined with a regexp
+ *
+ *
+ * @author andy
+ * @author steinar
+ * @author thore
+ */
+public class SchemeId {
+
+ private static final Icds ICDS = Icds.of(PeppolIcd.values());
+
+ /**
+ * Tries to find the Party id with the given schemeId
+ * e.g. "ES:VAT" --> ES_VAT
+ *
+ * @param schemeId textual representation of scheme, i.e. NO:ORGNR
+ * @return instance of SchemeId if found
+ * @throws IllegalStateException if not found, i.e. unknown scheme
+ */
+ public static Icd parse(String schemeId) {
+ return ICDS.findByIdentifier(schemeId);
+ }
+
+ /**
+ * Tries to find the Party id from the ISO652 code
+ * e.g. "9919" --> AT_KUR
+ *
+ * @param code
+ * @return the scheme id if found null otherwise.
+ */
+ public static Icd fromISO6523(String code) {
+ return ICDS.findByCode(code);
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/lang/InvalidPeppolParticipantException.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/lang/InvalidPeppolParticipantException.java
new file mode 100644
index 0000000000000000000000000000000000000000..6d158ab115f12e355c7f0f2fb7c7e3027b42442f
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/lang/InvalidPeppolParticipantException.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.lang;
+
+import network.oxalis.api.lang.OxalisRuntimeException;
+
+/**
+ * @author steinar
+ * Date: 09.11.2016
+ * Time: 20.09
+ */
+public class InvalidPeppolParticipantException extends OxalisRuntimeException {
+
+ public InvalidPeppolParticipantException(String s) {
+ super(s);
+ }
+
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/sbdh/SbdhWrapper.java b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/sbdh/SbdhWrapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..b9d40fd3d3cf8a8d3a7f1f95e5a8ac4730c9615b
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/java/network/oxalis/sniffer/sbdh/SbdhWrapper.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.sbdh;
+
+import network.oxalis.vefa.peppol.common.model.Header;
+import network.oxalis.vefa.peppol.sbdh.SbdWriter;
+import network.oxalis.vefa.peppol.sbdh.util.XMLStreamUtils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+
+/**
+ * Takes a document and wraps it together with headers into a StandardBusinessDocument.
+ *
+ * The SBDH part of the document is constructed from the headers.
+ * The document will be the payload (xs:any) following the SBDH.
+ *
+ * @author thore
+ * @author steinar
+ * @author erlend
+ */
+public class SbdhWrapper {
+
+ /**
+ * Wraps payload + headers into a StandardBusinessDocument
+ *
+ * @param inputStream the input stream to be wrapped
+ * @param headers the headers to use for sbdh
+ * @return byte buffer with the resulting output in utf-8
+ */
+ public byte[] wrap(InputStream inputStream, Header headers) {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ try (SbdWriter sbdWriter = SbdWriter.newInstance(baos, headers)) {
+ XMLStreamUtils.copy(inputStream, sbdWriter.xmlWriter());
+ } catch (Exception ex) {
+ throw new IllegalStateException("Unable to wrap document inside SBD (SBDH). " + ex.getMessage(), ex);
+ }
+
+ return baos.toByteArray();
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/main/resources/reference.conf b/oxalis-legacy/oxalis-document-sniffer/src/main/resources/reference.conf
new file mode 100644
index 0000000000000000000000000000000000000000..2cf612f1ab957fabd9ede9ba4f73ffac06712909
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/main/resources/reference.conf
@@ -0,0 +1 @@
+oxalis.module.document-sniffer.sniffer.class = network.oxalis.sniffer.SnifferModule
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/document/NoSbdh2PeppolHeaderParserTest.java b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/document/NoSbdh2PeppolHeaderParserTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..064d6854fc321492d0f4e46f87f6da950ce1e75b
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/document/NoSbdh2PeppolHeaderParserTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.document;
+
+import network.oxalis.sniffer.PeppolStandardBusinessHeader;
+import network.oxalis.test.identifier.PeppolDocumentTypeIdAcronym;
+import network.oxalis.vefa.peppol.common.model.ParticipantIdentifier;
+import org.testng.annotations.Test;
+
+import java.io.InputStream;
+
+import static org.testng.Assert.*;
+
+/**
+ * @author steinar
+ * Date: 05.11.13
+ * Time: 15:14
+ */
+public class NoSbdh2PeppolHeaderParserTest {
+
+ @Test
+ public void sniffDocumentWithoutSBDH() throws Exception {
+ InputStream resourceAsStream = getClass().getResourceAsStream("/ehf-invoice-no-sbdh.xml");
+ assertNotNull(resourceAsStream);
+
+ NoSbdhParser sniffer = new NoSbdhParser();
+ PeppolStandardBusinessHeader sbdh = sniffer.originalParse(resourceAsStream);
+
+ assertNotNull(sbdh.getDocumentTypeIdentifier());
+ assertNotNull(sbdh.getCreationDateAndTime());
+ assertNull(sbdh.getInstanceId(), "InstanceId should not be parsed from EHF invoice with no SBDH");
+ assertNotNull(sbdh.getProfileTypeIdentifier());
+ assertNotNull(sbdh.getRecipientId());
+ assertNotNull(sbdh.getSenderId());
+
+ assertEquals(sbdh.getSenderId(), ParticipantIdentifier.of("9908:991974466"));
+ assertEquals(sbdh.getRecipientId(), ParticipantIdentifier.of("9908:889640782"));
+
+ assertEquals(
+ sbdh.getDocumentTypeIdentifier(),
+ PeppolDocumentTypeIdAcronym.EHF_INVOICE.toVefa()
+ );
+
+ }
+
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/document/NoSbdhParserTest.java b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/document/NoSbdhParserTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..6366291505a1da2cfe8e199f5c03b89f73998f0f
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/document/NoSbdhParserTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.document;
+
+import network.oxalis.sniffer.PeppolStandardBusinessHeader;
+import org.testng.annotations.Test;
+
+import java.io.InputStream;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
+/**
+ * @author soc
+ */
+public class NoSbdhParserTest {
+
+ @Test
+ public void verifyCorrectParsingOfReceiver() throws Exception {
+
+ InputStream resourceAsStream = getClass().getResourceAsStream("/issue250/Issue250-sample-invoice.xml");
+ assertNotNull(resourceAsStream, "Test resource not found");
+
+ NoSbdhParser p = new NoSbdhParser();
+ PeppolStandardBusinessHeader peppolStandardBusinessHeader = p.originalParse(resourceAsStream);
+ String receiver = peppolStandardBusinessHeader.getRecipientId().getIdentifier();
+
+ assertEquals("9954:111111111", receiver);
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/CustomizationIdentifierTest.java b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/CustomizationIdentifierTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..c246eb0ca4a3279633c45afbf8e917530d520be2
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/CustomizationIdentifierTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+/* Created by steinar on 20.05.12 at 12:14 */
+
+package network.oxalis.sniffer.identifier;
+
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+
+/**
+ * @author Steinar Overbeck Cook steinar@sendregning.no
+ */
+public class CustomizationIdentifierTest {
+
+ @Test
+ public void parseEhfKreditNota() {
+ CustomizationIdentifier.valueOf("urn:www.cenbii.eu:transaction:biicoretrdm014:ver1.0" +
+ ":#urn:www.cenbii.eu:profile:biixx:ver1.0" +
+ "#urn:www.difi.no:ehf:kreditnota:ver1");
+ }
+
+ @Test
+ public void parseApplicationResponse() {
+ final String s = "urn:www.cenbii.eu:transaction:biicoretrdm057:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol1a:ver1.0";
+ CustomizationIdentifier customizationIdentifier = CustomizationIdentifier.valueOf(s);
+ assertEquals(customizationIdentifier.toString(), s);
+ }
+
+ @Test
+ public void equalsTest() {
+ final String s = "urn:www.cenbii.eu:transaction:biicoretrdm057:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol1a:ver1.0";
+ CustomizationIdentifier c1 = CustomizationIdentifier.valueOf(s);
+ CustomizationIdentifier c2 = CustomizationIdentifier.valueOf(s);
+
+ assertEquals(c1, c2);
+ }
+
+ @Test
+ public void valueOfEqualsAndEquals() throws Exception {
+ String value = "aamund var her";
+ CustomizationIdentifier customizationIdentifier = CustomizationIdentifier.valueOf(value);
+ assertEquals(customizationIdentifier.toString(), value);
+
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/DocumentTypeIdentifierTest.java b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/DocumentTypeIdentifierTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..2cf33f9ff788224c48ceb64a1c1fb2da1d91d121
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/DocumentTypeIdentifierTest.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.identifier;
+
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotEquals;
+
+/**
+ * @author Steinar Overbeck Cook steinar@sendregning.no
+ */
+public class DocumentTypeIdentifierTest {
+
+ @Test
+ public void testValueOf() {
+ String documentIdAsText =
+ "urn:oasis:names:specification:ubl:schema:xsd:ApplicationResponse-2::ApplicationResponse" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm057:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol1a:ver1.0" +
+ "::2.0";
+ PeppolDocumentTypeId documentTypeIdentifier = PeppolDocumentTypeId.valueOf(documentIdAsText);
+ assertEquals(documentTypeIdentifier.toString(), documentIdAsText);
+
+ assertEquals(documentTypeIdentifier.getRootNameSpace(),
+ "urn:oasis:names:specification:ubl:schema:xsd:ApplicationResponse-2");
+ assertEquals(documentTypeIdentifier.getLocalName(), "ApplicationResponse");
+ assertEquals(documentTypeIdentifier.getCustomizationIdentifier(), CustomizationIdentifier.valueOf(
+ "urn:www.cenbii.eu:transaction:biicoretrdm057:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol1a:ver1.0"));
+ assertEquals(documentTypeIdentifier.getVersion(), "2.0");
+ }
+
+ @Test
+ public void equals() {
+ String s = "urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2::CreditNote" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm014:ver1.0" +
+ ":#urn:www.cenbii.eu:profile:biixx:ver1.0" +
+ "#urn:www.difi.no:ehf:kreditnota:ver1" +
+ "::2.0";
+ String s2 = "urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2::CreditNote" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm014:ver1.0" +
+ ":#urn:www.cenbii.eu:profile:biixx:ver1.0" +
+ "#urn:www.difi.no:ehf:kreditnota:ver1" +
+ "::3.0";
+
+ PeppolDocumentTypeId d1 = PeppolDocumentTypeId.valueOf(s);
+ PeppolDocumentTypeId d2 = PeppolDocumentTypeId.valueOf(s);
+
+ PeppolDocumentTypeId d3 = PeppolDocumentTypeId.valueOf(s2);
+ assertEquals(d1, d2);
+
+ assertNotEquals(d1, d3);
+ }
+
+ /**
+ * Verifies the Tender document
+ */
+ @Test
+ public void tender() {
+ PeppolDocumentTypeId tender = new PeppolDocumentTypeId(
+ "urn:oasis:names:specification:ubl:schema:xsd:Tender-2",
+ "Tender",
+ new CustomizationIdentifier("urn:www.cenbii.eu:transaction:biitrdm090:ver3.0")
+ , "2.1");
+ assertEquals("urn:oasis:names:specification:ubl:schema:xsd:Tender-2::Tender" +
+ "##urn:www.cenbii.eu:transaction:biitrdm090:ver3.0" +
+ "::2.1", tender.toString());
+ }
+
+ @Test
+ public void testLotsOfExpectedPeppolDocumentTypeIds() {
+
+ // These are known to be in use and should be parsable without errors
+ String[] documentIdentifiers = {
+ // BIS and EHF
+ "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol4a:ver1.0" +
+ "#urn:www.difi.no:ehf:faktura:ver1" +
+ "::2.0",
+ "urn:oasis:names:specification:ubl:schema:xsd:Reminder-2::Reminder" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm017:ver1.0" +
+ ":#urn:www.cenbii.eu:profile:biixy:ver1.0" +
+ "#urn:www.difi.no:ehf:purring:ver1" +
+ "::2.0",
+ "urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm001:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol3a:ver1.0" +
+ "::2.0",
+ "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol4a:ver1.0" +
+ "::2.0",
+ "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm015:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol6a:ver1.0" +
+ "::2.0",
+ "urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2::CreditNote" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm014:ver1.0" +
+ ":#urn:www.cenbii.eu:profile:biixy:ver1.0" +
+ "#urn:www.difi.no:ehf:kreditnota:ver1" +
+ "::2.0",
+ "urn:oasis:names:specification:ubl:schema:xsd:OrderResponseSimple-2::OrderResponseSimple" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm003:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol6a:ver1.0" +
+ "::2.0",
+ "urn:oasis:names:specification:ubl:schema:xsd:Catalogue-2::Catalogue" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm019:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol1a:ver1.0" +
+ "::2.0",
+ "urn:oasis:names:specification:ubl:schema:xsd:OrderResponseSimple-2::OrderResponseSimple" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm002:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol6a:ver1.0" +
+ "::2.0",
+ "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm015:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol5a:ver1.0" +
+ "::2.0",
+ "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0" +
+ ":#urn:www.cenbii.eu:profile:biixy:ver1.0" +
+ "#urn:www.difi.no:ehf:faktura:ver1" +
+ "::2.0",
+ "urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2::CreditNote" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm014:ver1.0" +
+ ":#urn:www.cenbii.eu:profile:biixx:ver1.0" +
+ "#urn:www.difi.no:ehf:kreditnota:ver1" +
+ "::2.0",
+ "urn:oasis:names:specification:ubl:schema:xsd:ApplicationResponse-2::ApplicationResponse" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm057:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol1a:ver1.0" +
+ "::2.0",
+ "urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm001:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol6a:ver1.0" +
+ "::2.0",
+ "urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2::CreditNote" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm014:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol6a:ver1.0" +
+ "::2.0",
+ "urn:oasis:names:specification:ubl:schema:xsd:ApplicationResponse-2::ApplicationResponse" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm058:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol1a:ver1.0" +
+ "::2.0",
+ "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol6a:ver1.0" +
+ "::2.0",
+ "urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2::CreditNote" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm014:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol5a:ver1.0" +
+ "::2.0",
+ "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice" +
+ "##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol5a:ver1.0" +
+ "::2.0",
+ // NESUBL
+ "urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2::CreditNote" +
+ "##NESUBL-2.0" +
+ "::2.0",
+ "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice" +
+ "##NESUBL-2.0" +
+ "::2.0",
+ // OIOUBL
+ "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice" +
+ "##OIOUBL-2.02" +
+ "::2.0"
+ };
+
+ for (String s : documentIdentifiers) {
+ PeppolDocumentTypeId d = PeppolDocumentTypeId.valueOf(s);
+ assertEquals(d.toString(), s);
+ }
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/LocaleTest.java b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/LocaleTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..56db5ba6435a40234ab7939876e7a011e7755548
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/LocaleTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.identifier;
+
+import lombok.extern.slf4j.Slf4j;
+import org.testng.annotations.Test;
+
+import java.util.Locale;
+
+/**
+ * @author steinar
+ * Date: 09.11.2016
+ * Time: 18.09
+ */
+@Slf4j
+public class LocaleTest {
+
+ @Test
+ public void whatIsDefaultLocale() {
+ Locale aDefault = Locale.getDefault();
+ log.info("Default locale, country: " + aDefault.getCountry());
+ }
+
+ @Test
+ public void test() {
+ String[] strings = {"NO:ORGNR", "DUNS"};
+ for (String s : strings) {
+ String[] split = s.split(":");
+ log.info(split[0]);
+ }
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/ParticipantIdTest.java b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/ParticipantIdTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..d97bf29cda39b5e4f399fffb19301d7ed69098c2
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/ParticipantIdTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.identifier;
+
+import network.oxalis.sniffer.lang.InvalidPeppolParticipantException;
+import org.testng.annotations.Test;
+
+/**
+ * User: andy
+ * Date: 4/11/12
+ * Time: 11:19 AM
+ */
+public class ParticipantIdTest {
+
+ @Test
+ public void testSample() {
+ ParticipantId.valueOf("9908:810018909");
+
+ }
+
+ @Test(expectedExceptions = {InvalidPeppolParticipantException.class})
+ public void testInvalidScheme() {
+ ParticipantId.valueOf("0001:976098897");
+ }
+
+ @Test(expectedExceptions = InvalidPeppolParticipantException.class)
+ public void testOrgIdWithNoDigits() {
+ ParticipantId.valueOf("sender");
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/PeppolParticipantIdTest.java b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/PeppolParticipantIdTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..bf4fed4b6fe8860d3d30f83ac5998912d813dc55
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/PeppolParticipantIdTest.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.identifier;
+
+import network.oxalis.sniffer.lang.InvalidPeppolParticipantException;
+import network.oxalis.vefa.peppol.icd.code.PeppolIcd;
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import static org.testng.Assert.*;
+
+/**
+ * @author andy
+ * @author thore
+ */
+public class PeppolParticipantIdTest {
+
+ // ZZZ is not allowed in PEPPOL Network.
+ @Test(enabled = false)
+ public void testFoedselsnummerWhichCouldBeUsedByDigitalMultiKanal() {
+
+ // multikanal uses fødselsnummer
+ ParticipantId p1 = ParticipantId.valueOf("9999:42342342343");
+ assertNotNull(p1);
+
+ // multikanal uses orgnumbers
+ assertNotNull(ParticipantId.valueOf("9999:968218743"));
+
+ }
+
+ @Test
+ public void testParsePeppolParticpantId() throws Exception {
+
+ ParticipantId no976098897 = ParticipantId.valueOf("9908:976098897");
+ assertEquals(no976098897, new ParticipantId(PeppolIcd.NO_ORGNR, "976098897"));
+
+ no976098897 = ParticipantId.valueOf("9908:976098897");
+ assertEquals(no976098897, new ParticipantId(PeppolIcd.NO_ORGNR, "976098897"));
+
+ no976098897 = ParticipantId.valueOf("9901:976098897");
+ assertEquals(no976098897, new ParticipantId(PeppolIcd.DK_CPR, "976098897"));
+
+ //invalid iso code will not be parsed.
+ try {
+ ParticipantId.valueOf("0001:976098897");
+ fail("Invalid scheme should not result in a participant instance");
+ } catch (Exception e) {
+
+ }
+
+ }
+
+ /**
+ * Tests that when using value of we get null with invalid norwegian organisation numbers
+ */
+ @Test()
+ public void testIsValidValueOf() {
+
+
+ assertNotNull(ParticipantId.valueOf("9908:968218743"));
+
+ assertNotNull(ParticipantId.valueOf("9908:NO976098897MVA"));
+
+ assertNotNull(ParticipantId.valueOf("9908:NO 976098897 MVA"));
+
+ assertNotNull(ParticipantId.valueOf("9908:976098897 MVA"));
+
+ assertNotNull(ParticipantId.valueOf("9908:976098897MVA"));
+
+
+ }
+
+ @Test(expectedExceptions = {InvalidPeppolParticipantException.class})
+ public void invalidOrganisationNumbers() {
+ // Not a valid orgNo
+ assertNotNull(ParticipantId.valueOf("968218743"));
+
+ // not valid
+ assertNull(ParticipantId.valueOf("123456789"));
+ assertNull(ParticipantId.valueOf("986532933"));
+ assertNull(ParticipantId.valueOf("986532952"));
+ assertNull(ParticipantId.valueOf("986532954"));
+ assertNull(ParticipantId.valueOf("986532955"));
+ assertNotNull(ParticipantId.valueOf("988890081"));
+
+ assertNotNull(ParticipantId.valueOf("968 218 743"));
+
+ // null
+ assertNull(ParticipantId.valueOf((String) null));
+
+ // empty String
+ assertNull(ParticipantId.valueOf(""));
+ }
+
+ @Test
+ public void testOrganistaionId() throws Exception {
+ ParticipantId.valueOf("9908:968218743");
+ }
+
+ @Test
+ public void testOrgNumWithSpaces() throws Exception {
+ ParticipantId.valueOf("9908:968 218 743");
+
+ ParticipantId.valueOf("99 08:9682 18743");
+
+ ParticipantId.valueOf("00 07:9682 18743");
+ }
+
+
+ @Test
+ public void testSerialize() throws Exception {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(out);
+ ObjectInputStream ois = null;
+ try {
+ final ParticipantId expectedParticipantId = ParticipantId.valueOf("9908:976098897");
+
+ oos.writeObject(expectedParticipantId);
+ ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
+ ois = new ObjectInputStream(in);
+
+ final ParticipantId peppolParticipantId = (ParticipantId) ois.readObject();
+ assertEquals(peppolParticipantId, expectedParticipantId);
+ } finally {
+ oos.close();
+ if (ois != null) {
+ ois.close();
+ }
+ }
+
+
+ assertTrue(out.toByteArray().length > 0);
+ }
+
+
+ @Test(enabled = false)
+ public void testSRO3079() throws Exception {
+
+ ParticipantId peppolParticipantId = ParticipantId.valueOf("9147:91723");
+ assertNotNull(peppolParticipantId);
+
+ peppolParticipantId = ParticipantId.valueOf("9957:61394");
+ assertNotNull(peppolParticipantId);
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/SchemeIdTest.java b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/SchemeIdTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..a05c530c629c5a096b56bfcf78ccc37a85e7bdea
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/SchemeIdTest.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.identifier;
+
+import network.oxalis.vefa.peppol.icd.api.Icd;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+
+/**
+ * @author steinar
+ * Date: 10.11.2016
+ * Time: 11.54
+ */
+public class SchemeIdTest {
+
+ @Test
+ public void testBelgianCrossroadBankOfEnterprises() throws Exception {
+ Icd sid = SchemeId.parse("BE:CBE");
+ assertEquals(sid.getIdentifier(), "BE:CBE");
+ assertEquals(sid.getCode(), "9956");
+ assertEquals(SchemeId.fromISO6523("9956"), sid);
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/sbdh/ParseSbdhTest.java b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/sbdh/ParseSbdhTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..4ddfba0993686610c505bea7f306768de125d7b5
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/sbdh/ParseSbdhTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.sbdh;
+
+import network.oxalis.peppol.sbdh.jaxb.DocumentIdentification;
+import network.oxalis.peppol.sbdh.jaxb.StandardBusinessDocument;
+import org.testng.annotations.Test;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.Unmarshaller;
+import java.io.File;
+import java.io.FileInputStream;
+import java.net.URL;
+
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+/**
+ * @author steinar
+ * Date: 23.10.13
+ * Time: 14:51
+ *
+ * @author aaron-kumar
+ * @since 5.0.0
+ */
+public class ParseSbdhTest {
+
+ @Test(enabled = false)
+ public void testParseSbdh() throws Exception {
+ JAXBContext jaxbContext = JAXBContext.newInstance("org.unece.cefact.namespaces.standardbusinessdocumentheader");
+
+ Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+
+ URL resource = ParseSbdhTest.class.getClassLoader().getResource("peppol-bis-invoice-sbdh.xml");
+ assertNotNull(resource);
+
+ File file = new File(resource.toURI());
+ assertTrue(file.isFile() && file.canRead());
+
+ FileInputStream fileInputStream = new FileInputStream(file);
+
+ // Parses the entire XML document
+ //noinspection unchecked
+ JAXBElement sbdh = (JAXBElement) unmarshaller.unmarshal(fileInputStream);
+ assertNotNull(sbdh);
+
+ StandardBusinessDocument standardBusinessDocument = sbdh.getValue();
+ DocumentIdentification documentIdentification = standardBusinessDocument
+ .getStandardBusinessDocumentHeader().getDocumentIdentification();
+ assertNotNull(documentIdentification);
+
+ String type = standardBusinessDocument.getStandardBusinessDocumentHeader()
+ .getBusinessScope().getScope().get(0).getType();
+ String instanceIdentifier = standardBusinessDocument.getStandardBusinessDocumentHeader()
+ .getBusinessScope().getScope().get(0).getInstanceIdentifier();
+
+ System.out.println(type);
+ System.out.println(instanceIdentifier);
+ }
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/sbdh/SbdhWrapperTest.java b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/sbdh/SbdhWrapperTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..bfd49aec63e269d8b3707a286bd4af02c3e79744
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/sbdh/SbdhWrapperTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.sniffer.sbdh;
+
+import network.oxalis.api.header.HeaderParser;
+import network.oxalis.commons.header.SbdhHeaderParser;
+import network.oxalis.vefa.peppol.common.model.Header;
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.net.URL;
+
+import static org.testng.Assert.*;
+
+/**
+ * @author steinar
+ * @author thore
+ */
+public class SbdhWrapperTest {
+
+ private static final HeaderParser PARSER = new SbdhHeaderParser();
+
+ @Test
+ public void testWrapWithHeaders() throws Exception {
+
+ // parseOld header from an existing file
+ URL resource = ParseSbdhTest.class.getClassLoader().getResource("peppol-bis-invoice-sbdh.xml");
+ assertNotNull(resource);
+ File file = new File(resource.toURI());
+ assertTrue(file.isFile() && file.canRead());
+ Header header = PARSER.parse(new FileInputStream(file));
+
+ // wrap a new document in sbdh using the same header
+ InputStream resourceAsStream = SbdhWrapperTest.class.getClassLoader().getResourceAsStream("ehf-invoice-no-sbdh.xml");
+ assertNotNull(resourceAsStream);
+ SbdhWrapper sbdhWrapper = new SbdhWrapper();
+ byte[] wrap = sbdhWrapper.wrap(resourceAsStream, header);
+
+ // just print the wrapped document for visual debugging
+ // String s = new String(wrap, "UTF-8");
+ // System.out.println(s);
+
+ // validate that header from result document matches the original
+ Header resultHeaders = PARSER.parse(new ByteArrayInputStream(wrap));
+ assertEquals(resultHeaders.getSender(), header.getSender());
+ assertEquals(resultHeaders.getReceiver(), header.getReceiver());
+ assertEquals(resultHeaders.getDocumentType(), header.getDocumentType());
+ assertEquals(resultHeaders.getProcess(), header.getProcess());
+ // assertEquals(resultHeaders.getInstanceId(), header.getInstanceId());
+ // assertEquals(resultHeaders.getCreationDateAndTime(), header.getCreationDateAndTime());
+
+ }
+
+}
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/test/resources/ehf-invoice-no-sbdh.xml b/oxalis-legacy/oxalis-document-sniffer/src/test/resources/ehf-invoice-no-sbdh.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cafbc9aff063b36ccab7881fd40227d1ca02227f
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/test/resources/ehf-invoice-no-sbdh.xml
@@ -0,0 +1,289 @@
+
+
+
+
+
+
+ 2.0
+
+ urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0#urn:www.difi.no:ehf:faktura:ver1
+
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ 3456
+ 2013-11-05
+ Levering: NAV HMS Nord-Trøndelag - Kikrkegata 2 C - 7600 Levanger
+ NOK
+
+ 1671018
+
+
+
+ 9908:991974466
+
+ Comfort Audio AS
+
+
+ Postboks 304
+ SANDEFJORD
+ 3201
+
+ NO
+
+
+
+ 991974466MVA
+
+
+ VAT
+
+
+
+ Comfort Audio AS
+ 991974466
+
+
+ 3462
+ 95987910
+ alexander.delgado@comfortaudio.com
+
+
+
+
+
+ 9908:889640782
+
+ 10019
+
+
+ NAV Økonomitjeneste
+
+
+ Sognefjordveien 56
+ LEIKANGER
+ 6863
+
+ NO
+
+
+
+ NAV Økonomitjeneste
+ 889640782
+
+
+ SRA4711
+
+
+
+
+ 2013-11-05
+
+
+ Sognefjordveien 56
+ LEIKANGER
+ 6863
+
+ NO
+
+
+
+
+
+ 31
+ 2013-12-05
+
+ 60210741723
+
+
+
+
+ 4105.00
+
+ 16420.00
+ 4105.00
+
+ S
+ 25.00
+
+ VAT
+
+
+
+
+
+ 16420.00
+ 16420.00
+ 20525.00
+ 0.00
+ 20525.00
+
+
+
+ 1
+ 1.00
+ 5890.00
+
+ Comfort Digisystem DM10 (HMS nr. 160723)
+
+ F00209
+
+
+ S
+ 25.00
+
+ VAT
+
+
+
+
+ 5890.00
+
+
+
+
+ 2
+ 1.00
+ 425.00
+
+ Veske Digisystem (HMS nr. 161381)
+
+ F00493
+
+
+ S
+ 25.00
+
+ VAT
+
+
+
+
+ 425.00
+
+
+
+
+ 3
+ 1.00
+ 190.00
+
+ Nettadapter A11 1-2 enheter (HMS nr. 161752)
+
+ F00359
+
+
+ S
+ 25.00
+
+ VAT
+
+
+
+
+ 190.00
+
+
+
+
+ 4
+ 1.00
+ 1795.00
+
+ Hodebøylemikrofon (HMS nr. 161759)
+
+ F00243
+
+
+ S
+ 25.00
+
+ VAT
+
+
+
+
+ 1795.00
+
+
+
+
+ 5
+ 2.00
+ 950.00
+
+ Ladestativ DM/DH (HMS nr. 161760)
+
+ F00254
+
+
+ S
+ 25.00
+
+ VAT
+
+
+
+
+ 475.00
+
+
+
+
+ 6
+ 1.00
+ 7170.00
+
+ Comfort Digisystem DM90 m/BT (HMS nr. 193853)
+
+ F00684
+
+
+ S
+ 25.00
+
+ VAT
+
+
+
+
+ 7170.00
+
+
+
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/test/resources/issue250/Issue250-sample-invoice-with-sbdh.xml b/oxalis-legacy/oxalis-document-sniffer/src/test/resources/issue250/Issue250-sample-invoice-with-sbdh.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d79fe22f124a0b42ecd32937b829d113f2b35ae9
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/test/resources/issue250/Issue250-sample-invoice-with-sbdh.xml
@@ -0,0 +1,185 @@
+
+
+
+ 1.0
+
+ 9908:XXXXXX
+
+
+ 9908:222222222
+
+
+ XXXXXX
+ 2.0
+ XXXXXX
+ Invoice
+ XXXXXX-05-03T11:25:25.026+05:30
+
+
+
+ DOCUMENTID
+ XXXXXX
+
+
+ PROCESSID
+ XXXXXX
+
+
+
+
+ 2.0
+ XXXXXX
+ XXXXXX
+ XXXXXX
+ XXXXXX-04-24
+ 380
+ NOK
+
+ XXXXXX
+ XXXXXX
+
+
+
+
+ XXXXXX
+
+
+ XXXXXX
+
+
+ XXXXXX
+
+ XXXXXX
+ XXXXXX
+
+ XXXXXX
+
+
+
+ XXXXXX
+
+ XXXXXX
+
+
+
+ XXXXXX
+ XXXXXX
+
+
+ XXXXXX
+ XXXXXX
+ XXXXXX
+
+
+
+
+
+ 9954:XXXXXX
+
+ XXXXXX
+
+
+ XXXXXX
+
+
+ XXXXXX
+
+ XXXXXX
+ XXXXXX
+
+ XXXXXX
+
+
+
+ XXXXXX
+
+ XXXXXX
+
+
+
+ XXXXXX
+ XXXXXX
+
+
+ XXXXXX
+ XXXXXX
+
+
+
+
+ XXXXXX-04-25
+
+ XXXXXX
+
+ XXXXXX
+ XXXXXX
+ XXXXXX
+
+ XXXXXX
+
+
+
+
+
+ XXXXXX
+ XXXXXX-05-24
+ XXXXXX-
+
+ XXXXXX
+
+
+
+ XXXXXX
+
+
+ XXXXXX
+
+ XXXXXX
+ XXXXXX
+
+ S
+ XXXXXX
+
+ XXXXXX
+
+
+
+
+
+ XXXXXX
+ XXXXXX
+ XXXXXX
+ XXXXXX
+
+
+ 10
+ 1.000
+ XXXXXX
+
+ XXXXXX
+ XXXXXX
+ XXXXXX
+
+
+ XXXXXX
+
+
+ XXXXXX
+
+ XXXXXX
+
+
+ S
+ XXXXXX
+
+ XXXXXX
+
+
+
+
+ XXXXXX
+
+
+
+
\ No newline at end of file
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/test/resources/issue250/Issue250-sample-invoice.xml b/oxalis-legacy/oxalis-document-sniffer/src/test/resources/issue250/Issue250-sample-invoice.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b1648ed7d8a11aadd3f8e65433afcfa0731efe88
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/test/resources/issue250/Issue250-sample-invoice.xml
@@ -0,0 +1,158 @@
+
+
+
+ 2.0
+ XXXXXXX
+ XXXXXXX
+ XXXXXXX
+ XXXXXXX-04-24
+ 380
+ NOK
+
+ XXXXXXXXXXXXXX
+ XXXXXXX
+
+
+
+
+ XXXXX
+
+
+ sdasdasda
+
+
+ sdfsdfasdad
+
+ asadad
+ asda
+
+ XX
+
+
+
+ dfreddewdd
+
+ XXX
+
+
+
+ Olafsen Engros AS
+ 981588347
+
+
+ XXXXXXX
+ XXXXXXX
+ XXXXXXX
+
+
+
+
+
+ 9954:111111111
+
+ XXXXXXX
+
+
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+
+
+ XXXXXXX
+
+ XXXXXXX
+ XXXXXXX
+
+ XXXXXXX
+
+
+
+ XXXXXXX
+
+ XXXXXXX
+
+
+
+ XXXXXXX
+ 222222222
+
+
+ XXXXXXX
+ XXXXXXXXXXXXXX
+
+
+
+
+ XXXXXXX-04-25
+
+ XXXXXXXXXXXXXX
+
+ XXXXXXXXXXXXXX
+ XXXXXXX
+ XXXXXXX
+
+ XXXXXXX
+
+
+
+
+
+ XXXXXXX
+ XXXXXXX-05-24
+ XXXXXXX-
+
+ XXXXXXX
+
+
+
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXX
+
+
+ XXXXXXX.55
+
+ XXXXXXX.18
+ XXXXXXX.55
+
+ S
+ XXXXXXX.0
+
+ XXXXXXX
+
+
+
+
+
+ XXXXXXX.XX
+ XXXXXXX.XX
+ XXXXXXX.XX
+ XXXXXXX.XX
+
+
+ XX
+ XX.000
+ XXXXXXX.XX
+
+ XXXXXXX
+ XXXXXXX
+ XXXXXXX
+
+
+ XXXXXXX
+
+
+ XXXXXXX
+
+ XXXXXXX
+
+
+ S
+ XXXXXXX.0
+
+ XXXXXXX
+
+
+
+
+ XXXXXXX
+
+
+
\ No newline at end of file
diff --git a/oxalis-legacy/oxalis-document-sniffer/src/test/resources/peppol-bis-invoice-sbdh.xml b/oxalis-legacy/oxalis-document-sniffer/src/test/resources/peppol-bis-invoice-sbdh.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5939bb626fd49f84fb0abf0d130dfb15c3b1f063
--- /dev/null
+++ b/oxalis-legacy/oxalis-document-sniffer/src/test/resources/peppol-bis-invoice-sbdh.xml
@@ -0,0 +1,150 @@
+
+
+
+ 1.0
+
+ 0007:5567125082
+
+
+ 0007:4455454480
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2
+ 2.0
+ 1070e7f0-3bae-11e3-aa6e-0800200c9a66
+ Invoice
+ 2013-02-19T05:10:10
+
+
+
+ DOCUMENTID
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0::2.0
+
+
+ PROCESSID
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+
+
+
+
+ 2.0
+ urn:www.cenbii.eu:transaction:biicoretrdm010:ver1.0:#urn:www.peppol.eu:bis:peppol4a:ver1.0
+ urn:www.cenbii.eu:profile:bii04:ver1.0
+ 1
+ 2012-06-08
+ 380
+ 2012-06-08
+ SEK
+ SOPE
+
+
+
+ 5567125082
+
+
+ Ecru Consulting
+
+
+ Gamla Brogatan
+ 29
+ Stockholm
+ 11120
+
+ SE
+
+
+
+ SE556712508201
+
+ VAT
+
+
+
+ 810418052
+
+
+ Martin
+ Forsberg
+
+
+
+
+
+
+ 4455454480
+
+
+ EKONOMISTYRNINGSVERKET (NATIONAL FINANCIAL MANAGEMENT AUTHORITY)
+
+
+ 45316
+ EFFEKTIV ADMINISTRATION
+ STOCKHOLM
+ 104 30
+
+ SE
+
+
+
+ 976098897
+
+
+ 08 - 123456
+ 08-123457
+ infomail@esv.se
+
+
+ SOREN
+ PEDERSEN
+
+
+
+
+ 31
+ 2012-06-23
+
+ 5955559
+
+
+ BGABSESS
+
+
+
+
+
+ 0.25
+
+ 1
+ 0.25
+
+ S
+ 25
+
+ VAT
+
+
+
+
+
+ 1
+ 1
+ 1.25
+ 1.25
+
+
+ 1
+ 1
+ 1
+
+ 1
+
+
+ TEST AV PEPPOL-FAKTURA
+
+
+ 1
+ 1
+
+
+
+
diff --git a/oxalis-legacy/oxalis-persistence/.gitignore b/oxalis-legacy/oxalis-persistence/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..249cda967c11bb62c8affe06d18f26bc5b5f3af0
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/.gitignore
@@ -0,0 +1 @@
+/data
\ No newline at end of file
diff --git a/oxalis-legacy/oxalis-persistence/doc/persistence-component.puml b/oxalis-legacy/oxalis-persistence/doc/persistence-component.puml
new file mode 100644
index 0000000000000000000000000000000000000000..caf6cce2230798ff175a1ec98140766d0458b6d2
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/doc/persistence-component.puml
@@ -0,0 +1,18 @@
+@startuml
+
+package "RepositoryModule" {
+ interface DataSource
+ interface Repository
+ interface JdbcTxManager
+ Repository -> JdbcTxManager
+ JdbcTxManager -> DataSource
+
+}
+
+interface OxalisDataSourceFactory
+interface GlobalConfiguration
+
+RepositoryModule -> GlobalConfiguration
+RepositoryModule -> OxalisDataSourceFactory
+
+@enduml
\ No newline at end of file
diff --git a/oxalis-legacy/oxalis-persistence/pom.xml b/oxalis-legacy/oxalis-persistence/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2e1ea96e8862ed346cfa69ebdf978d1f99900df5
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/pom.xml
@@ -0,0 +1,115 @@
+
+
+
+
+ oxalis
+ dk.erst.oxalis
+ 0.9.0-e2f4121ccb55b5a60e6edebf7b28d277741d6789
+ ../../pom.xml
+
+ 4.0.0
+
+ oxalis-persistence
+ jar
+
+ Oxalis :: Leg :: Persistence
+ Persistence layer of the Oxalis application. Holds code related to DataSource
+ https://rep.erst.dk/git/openebusiness/nemhandeledelivery/oxalis
+
+
+ Erhvervsstyrelsen
+ https://nemhandel.dk/
+
+
+
+
+ org.apache.commons
+ commons-dbcp2
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+
+
+ org.slf4j
+ slf4j-api
+
+
+ org.slf4j
+ jcl-over-slf4j
+
+
+ ch.qos.logback
+ logback-classic
+ provided
+
+
+
+
+ dk.erst.oxalis
+ oxalis-commons
+
+
+ dk.erst.oxalis
+ oxalis-test
+ test
+
+
+
+ com.google.inject
+ guice
+
+
+
+ com.h2database
+ h2
+
+
+ org.hsqldb
+ hsqldb
+ test
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+
+
+
+ test-jar
+
+
+
+
+
+
+
+
diff --git a/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/annotation/Repository.java b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/annotation/Repository.java
new file mode 100644
index 0000000000000000000000000000000000000000..5b117a018c4f04048c3a84b44a84515ec11d6e34
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/annotation/Repository.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.annotation;
+
+import network.oxalis.persistence.aop.RepositoryConnectionMethodInterceptor;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates to Google Guice where that the java class is a Repository.
+ * This enables us to automatically fetch the connection before a method is invoked.
+ *
+ * Only works for methods that are public, package-private or protected (https://github.com/google/guice/wiki/AOP)
+ *
+ * @see RepositoryConnectionMethodInterceptor
+ *
+ * User: andy
+ * Date: 1/19/12
+ * Time: 12:03 PM
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+public @interface Repository {
+
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/annotation/Transactional.java b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/annotation/Transactional.java
new file mode 100644
index 0000000000000000000000000000000000000000..b0fef157d2bc3842fa7bd944d65c1d836eb41ef4
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/annotation/Transactional.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.annotation;
+
+import network.oxalis.persistence.aop.TransactionalMethodInterceptor;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates to Google Guice that the method specified should be handled within a transaction
+ *
+ * Only works for methods that are public, package-private or protected (https://github.com/google/guice/wiki/AOP)
+ *
+ * @see TransactionalMethodInterceptor
+ *
+ * User: andy
+ * Date: 1/19/12
+ * Time: 12:03 PM
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface Transactional {
+
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/aop/JdbcTxManagerImpl.java b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/aop/JdbcTxManagerImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..1a02fb598dd94d758f3089c47ef028c8718411d9
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/aop/JdbcTxManagerImpl.java
@@ -0,0 +1,268 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.aop;
+
+
+import com.google.inject.Inject;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.persistence.api.JdbcTxManager;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+/**
+ * Implementation of a transaction manager, which is responsible
+ * for handling a Connection object which is placed into ThreadLocal.
+ *
+ * It is responsible for fetching Connection objects from a DataSource, and setting
+ * them up so that they can be transactional (autoCommit --> false).
+ *
+ * It also can be used to rollback programatically an existing transaction.
+ */
+@Slf4j
+public class JdbcTxManagerImpl implements JdbcTxManager {
+
+ private static int instances = 0;
+
+ /**
+ * Used to track problems with multiple instances being created.
+ */
+ private int id;
+
+ /**
+ * Stores a thread local copy of the current connection
+ */
+ private final ThreadLocal threadLocalJdbcTransaction = new ThreadLocal<>();
+
+ private final DataSource dataSource;
+
+ @Inject
+ public JdbcTxManagerImpl(DataSource dataSource) {
+ if (dataSource == null) {
+ throw new IllegalArgumentException("DataSource not supplied in constructor");
+ }
+ this.id = instances;
+ instances++;
+ trace("new instance");
+ this.dataSource = dataSource;
+ }
+
+ @Override
+ public boolean isTransaction() {
+
+ try {
+ final Connection connection = getThreadLocalConnection();
+ return connection != null && !connection.getAutoCommit();
+ } catch (SQLException e) {
+ throw new IllegalStateException("Unable to check if a transaction has been started", e);
+ }
+ }
+
+ @Override
+ public boolean isConnection() {
+ final Connection connection = getThreadLocalConnection();
+ return connection != null;
+ }
+
+ @Override
+ public void newConnection(boolean autoCommit) {
+
+ try {
+ //only allowed to create a new transaction if the old one is commited.
+ if (isTransaction()) {
+ final String message = "Unable to start a new transaction existing connection is not commited";
+ trace(message);
+ throw new IllegalStateException(message);
+ }
+
+ //fetches the connection from the datasource.
+ final Connection connection = dataSource.getConnection();
+
+ //sets whether or not the connection should autocommit.
+ connection.setAutoCommit(autoCommit);
+
+ //adds the connection to the current thread
+ final JdbcTransaction jdbcTransaction = new JdbcTransaction(connection);
+ threadLocalJdbcTransaction.set(jdbcTransaction);
+
+ } catch (SQLException e) {
+ final String message = "Unable to get a connection from the provided datasource";
+ trace(message);
+ throw new IllegalStateException(message, e);
+ }
+ }
+
+ @Override
+ public void commit() {
+
+ try {
+ if (!isTransaction()) {
+ final String message = "Unable to commit transaction connection, no transaction exists";
+ trace(message);
+ throw new IllegalStateException(message);
+ }
+
+ final JdbcTransaction jdbcTransaction = threadLocalJdbcTransaction.get();
+ //if the transaction has been marked for rollback, rollback the transaction.
+ if (jdbcTransaction.isRollback()) {
+ trace("Not commiting - Transaction marked for rollback");
+ rollback();
+ } else {
+ //Commits the transaction... connection cannot be null as the isTransaction method tests for that
+ trace("Commiting transaction");
+ jdbcTransaction.getConnection().commit();
+ }
+
+ } catch (SQLException e) {
+ final String message = "Unable to commit the transaction";
+ trace(message);
+ throw new IllegalStateException(message, e);
+ }
+ }
+
+ @Override
+ public void rollback() {
+ try {
+ if (!isTransaction()) {
+ final String message = "Unable to rollback transaction, no transaction exists";
+ trace(message);
+ throw new IllegalStateException(message);
+ }
+ getThreadLocalConnection().rollback();
+ } catch (SQLException e) {
+ final String message = "Unable to rollback the transaction";
+ trace(message);
+ throw new IllegalStateException(message, e);
+ }
+ }
+
+ @Override
+ public void cleanUp() {
+ try {
+ //closes the connection
+ final Connection connection = getThreadLocalConnection();
+ if (connection != null) {
+ trace("closing connection");
+ connection.close();
+ }
+ } catch (SQLException e) {
+ final String message = "Unable to close the connection";
+ trace(message);
+ throw new IllegalStateException(message, e);
+ } finally {
+ //Essential that we remove the reference to thread local to avoid memory leaks
+ trace("Removing transaction manager");
+ threadLocalJdbcTransaction.set(null);
+ threadLocalJdbcTransaction.remove(); // Ensures we don't get memory leaks
+ }
+ }
+
+ /**
+ * Gets the connection
+ *
+ * @return
+ */
+ @Override
+ public Connection getConnection() {
+ final Connection connection = getThreadLocalConnection();
+ if (connection == null) {
+ final String message = "Unable to get the connection. Did you forget to annotate the method with @Transactional or the repository with @Repository?";
+ trace(message);
+ throw new IllegalStateException(message);
+ }
+ try {
+ if (connection.isClosed()) {
+ throw new IllegalStateException("Connection is closed!");
+ }
+ } catch (SQLException e) {
+ throw new IllegalStateException("Unable to inspect connection: " + e.getMessage(), e);
+ }
+ return connection;
+ }
+
+ /**
+ * marks the transaction to be rollbacked
+ */
+ @Override
+ public void setRollbackOnly() {
+ final JdbcTransaction jdbcTransaction = threadLocalJdbcTransaction.get();
+ if (jdbcTransaction == null) {
+ final String message = "Unable to mark the transaction as rollbackOnly. Did you forget to annotate the method with @Transactional or the repository with @Repository?";
+ trace(message);
+ throw new IllegalStateException(message);
+ }
+ trace("Transaction marked for rollback");
+ jdbcTransaction.setRollback(true);
+ }
+
+ /**
+ * Helper method for null safe fetching of the JDBC Connection.
+ *
+ * @return
+ */
+ private Connection getThreadLocalConnection() {
+ final JdbcTransaction jdbcTransaction = threadLocalJdbcTransaction.get();
+ return jdbcTransaction == null ? null : jdbcTransaction.getConnection();
+ }
+
+ /**
+ * logs a debug message with the current transaction object
+ *
+ * @param message
+ */
+ @Override
+ public void trace(String message) {
+ if (log.isDebugEnabled()) {
+ JdbcTransaction jdbcTransaction = threadLocalJdbcTransaction.get();
+ final String transaction = jdbcTransaction == null ? "" : ("" + jdbcTransaction.hashCode());
+ log.debug(String.format("Trace %s:%s\t>>\t%s", id, transaction, message));
+ }
+ }
+
+ /**
+ * Helper class that holds a Connection object and whether or not the transaction should be rolled back.
+ */
+ private class JdbcTransaction {
+
+ private final Connection connection;
+
+ private boolean rollback = false;
+
+ private JdbcTransaction(Connection connection) {
+ this.connection = connection;
+ }
+
+ public Connection getConnection() {
+ return connection;
+ }
+
+ public void setRollback(boolean rollback) {
+ this.rollback = rollback;
+ }
+
+ public boolean isRollback() {
+ return rollback;
+ }
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/aop/RepositoryConnectionMethodInterceptor.java b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/aop/RepositoryConnectionMethodInterceptor.java
new file mode 100644
index 0000000000000000000000000000000000000000..4d7ac76a0f0e984ae10021ab6408cb89c8b26b99
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/aop/RepositoryConnectionMethodInterceptor.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.aop;
+
+import com.google.inject.Inject;
+import network.oxalis.persistence.annotation.Transactional;
+import network.oxalis.persistence.api.JdbcTxManager;
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+
+/**
+ * Looks for all @Repository annotations and makes a database connection available to the
+ * methods within the repository.
+ *
+ * User: andy
+ * Date: 8/13/12
+ * Time: 2:19 PM
+ */
+public class RepositoryConnectionMethodInterceptor implements MethodInterceptor {
+
+ @Inject
+ private JdbcTxManager jdbcTxManager;
+
+ /**
+ * Starts a jdbc transaction if a transaction doesnt already exist.
+ * Joins the transaction if one exists
+ *
+ * @param invocation the method invocation joinpoint
+ * @return the result of the call to {@link
+ * org.aopalliance.intercept.Joinpoint#proceed()}, might be intercepted by the
+ * interceptor.
+ * @throws Throwable if the interceptors or the
+ * target-object throws an exception.
+ */
+ @Override
+ public Object invoke(MethodInvocation invocation) throws Throwable {
+
+ //Ignore the call if the current method is annotated with Transactional
+ if (invocation.getMethod().isAnnotationPresent(Transactional.class)) {
+ jdbcTxManager.trace(String.format(
+ "Ignoring method %s because it is annotated with Transactional",
+ invocation.getMethod().toGenericString()));
+ return invocation.proceed();
+ }
+
+ //if there is already a connection do nothing as the connection will be cleaned up elsewhere
+ if (jdbcTxManager.isConnection()) {
+ // just continue
+ jdbcTxManager.trace("Using existing connection for method " + invocation.getMethod().getName());
+ return invocation.proceed();
+ }
+
+
+ // Commits/rollbacks the transaction
+ try {
+ jdbcTxManager.newConnection(true);
+ jdbcTxManager.trace("Fetched connection from datasource");
+
+ return invocation.proceed();
+ } finally {
+ //Essential that we clean up
+ jdbcTxManager.cleanUp();
+ }
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/aop/TransactionalMethodInterceptor.java b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/aop/TransactionalMethodInterceptor.java
new file mode 100644
index 0000000000000000000000000000000000000000..d75e746b1e878f3139a26a67cba474852cf35207
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/aop/TransactionalMethodInterceptor.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.aop;
+
+import com.google.inject.Inject;
+import network.oxalis.persistence.api.JdbcTxManager;
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+
+/**
+ * Looks for all @Transactional annotations and injects code for starting and stopping transactions.
+ *
+ * User: andy
+ * Date: 8/13/12
+ * Time: 2:19 PM
+ */
+public class TransactionalMethodInterceptor implements MethodInterceptor {
+
+ @Inject
+ private JdbcTxManager jdbcTxManager;
+
+ /**
+ * Starts a jdbc transaction if a transaction doesnt already exist.
+ * Joins the transaction if one exists.
+ *
+ * @param invocation the method invocation joinpoint
+ * @return the result of the call to {@link
+ * org.aopalliance.intercept.Joinpoint#proceed()}, might be intercepted by the
+ * interceptor.
+ * @throws Throwable if the interceptors or the
+ * target-object throws an exception.
+ * IllegalStateException if there already exists a connection which is not transactional
+ */
+ @Override
+ public Object invoke(MethodInvocation invocation) throws Throwable {
+
+ //we need to find out whether or not there is an existing transaction or an existing Connection
+ final boolean transaction = jdbcTxManager.isTransaction();
+ final boolean connection = jdbcTxManager.isConnection();
+
+ //If there is a transaction running do nothing as the transaction will be cleaned up by the
+ //code which created the transaction
+ if (transaction) {
+ //tx already exists so continues operation.
+ jdbcTxManager.trace(String.format("Transaction already exists so not starting a new one when calling method: %s", invocation.getMethod().getName()));
+ return invocation.proceed();
+ }
+
+ //If there is a connection we have decided that this is an error because it means that
+ //a non transactional method in a repository is calling a transactional method elsewhere.
+ //which we believe is BAD DESIGN. (It would be possible to implement using a separate variable
+ //for the transactional connection if we ever change our minds ;))
+ if (connection) {
+ throw new IllegalStateException("Unable to start a transaction, there already exists a connection which is not transactional" + invocation.getMethod().getName());
+ }
+
+ try {
+ // Starts the transaction by setting the autocommit value to be false on the connection.
+ jdbcTxManager.newConnection(false);
+ jdbcTxManager.trace("Started new transaction due to annotation on method: " + invocation.getMethod().getName());
+ //makes the call to the method that is being wrapped.
+ Object returnValue = invocation.proceed();
+
+ // Tries to commit the transaction.
+ // it is still possible that the TxManager will rollback the transaction,
+ // but as far as we are concerned our code worked as expected
+ jdbcTxManager.commit();
+
+ //returns the result of the wrapped method call
+ return returnValue;
+ } catch (Throwable thr) {
+ //if an exception is thrown we need to rollback the transaction.
+ jdbcTxManager.trace("Rolling back transaction due to exception: " + thr.getMessage());
+ jdbcTxManager.rollback();
+ jdbcTxManager.trace("Rolling back transaction ok");
+ //rethrows the exception so that it can be handled by the calling code
+ throw thr;
+ } finally {
+ //Essential that we clean up as we are placing connections on thread local
+ jdbcTxManager.cleanUp();
+ }
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/api/DataSourceProvider.java b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/api/DataSourceProvider.java
new file mode 100644
index 0000000000000000000000000000000000000000..182f71dadd43ecb6ed654e610bb51c48ca66154a
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/api/DataSourceProvider.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.api;
+
+import javax.sql.DataSource;
+
+/**
+ * @author steinar
+ * Date: 18.04.13
+ * Time: 13:43
+ */
+public interface DataSourceProvider {
+
+ DataSource getDataSource();
+
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/api/JdbcTxManager.java b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/api/JdbcTxManager.java
new file mode 100644
index 0000000000000000000000000000000000000000..80defbad390626743ab65f6f55817319a81378f3
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/api/JdbcTxManager.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.api;
+
+import java.sql.Connection;
+
+/**
+ * Manages JDBC transactions.
+ *
+ * Provides access to the connection object which is automagically fetched
+ * as long as the the method is in a class annotated with @Repository or
+ * the method is annotated with @Transactional
+ * The connection is stored in ThreadLocal
+ *
+ * User: andy
+ * Date: 8/9/12
+ * Time: 1:23 PM
+ */
+public interface JdbcTxManager {
+
+ /**
+ * Checks whether the current connection is not null and autocomit is set to false.
+ * @return
+ */
+ boolean isTransaction();
+
+ /**
+ * Checks if the current connection is null.
+ * @return
+ */
+ boolean isConnection();
+
+ /**
+ * N.B. DO NOT USE THIS METHOD DIRECTLY. It is only to be used by the TransactionalMethodInterceptor
+ * and the RepositoryConnectionMethodInterceptor
+ *
+ * Makes a Connection object available from the getConnection() method with either autocomit set to true or false.
+ *
+ * @param autoCommit automatically commits after each execute. Set to false to use transactions.
+ */
+ void newConnection(boolean autoCommit);
+
+ /**
+ * Commits the current connection
+ * Requires that the existing connection was created with autocommit set to false.
+ */
+ void commit();
+
+ /**
+ * Rollbacks the current connection
+ */
+ void rollback();
+
+ /**
+ * Closes the connection and removes the connection from the thread local
+ */
+ void cleanUp();
+
+ /**
+ * Gets the connection that is currently being used.
+ * @return
+ */
+ Connection getConnection();
+
+ /**
+ * Marks the transaction for rollback when completing.
+ * The connection will always be rolled back even when an exception does not occur.
+ */
+ void setRollbackOnly();
+
+
+ void trace(String message);
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/api/Platform.java b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/api/Platform.java
new file mode 100644
index 0000000000000000000000000000000000000000..681d9c8a521c6b4efbc9f28cfbe44c41a8caa211
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/api/Platform.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.api;
+
+import network.oxalis.api.inject.NamedImpl;
+
+import javax.inject.Named;
+
+/**
+ * @author erlend
+ */
+public interface Platform {
+
+ boolean detect(String identifier);
+
+ String getIdentifier();
+
+ default Named getNamed() {
+ return new NamedImpl(getIdentifier());
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/datasource/DbcpDataSourceProvider.java b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/datasource/DbcpDataSourceProvider.java
new file mode 100644
index 0000000000000000000000000000000000000000..283fbecdeee4a5387d17d2feb63605259abb71c4
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/datasource/DbcpDataSourceProvider.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.datasource;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.name.Named;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.api.settings.Settings;
+import network.oxalis.commons.filesystem.ClassLoaderUtils;
+import network.oxalis.persistence.util.PersistenceConf;
+import org.apache.commons.dbcp2.*;
+import org.apache.commons.pool2.impl.GenericObjectPool;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.sql.DataSource;
+import java.nio.file.Path;
+import java.sql.Driver;
+import java.util.Properties;
+
+/**
+ * Given a set configuration parameters represented by {@link Settings}, this class will
+ * provide a DataSource wrapped in a DataSource pool.
+ *
+ * Relies upon Guice to make sure provided DataSource is threated as a singleton.
+ *
+ * @author steinar
+ * Date: 18.04.13
+ * Time: 13:28
+ * @author erlend
+ */
+@Slf4j
+public class DbcpDataSourceProvider implements Provider {
+
+ private final Settings settings;
+
+ private final Path homeFolder;
+
+ @Inject
+ public DbcpDataSourceProvider(Settings settings, @Named("home") Path homeFolder) {
+ this.settings = settings;
+ this.homeFolder = homeFolder;
+
+ log.info("DataSource: {} ", settings.getString(PersistenceConf.JDBC_CONNECTION_URI));
+ }
+
+ /**
+ * Creates a DataSource with connection pooling as provided by Apache DBCP
+ *
+ * @return a DataSource
+ */
+ public DataSource get() {
+
+ log.debug("Configuring DataSource wrapped in a Database Connection Pool, using custom loader");
+
+ Path jdbcDriverClassPath = settings.getPath(PersistenceConf.DRIVER_PATH, homeFolder);
+
+ log.debug("Loading JDBC Driver with custom class path: " + jdbcDriverClassPath);
+ // Creates a new class loader, which will be used for loading our JDBC driver
+ ClassLoader classLoader = ClassLoaderUtils.initiate(jdbcDriverClassPath);
+
+ String className = settings.getString(PersistenceConf.DRIVER_CLASS);
+ String connectURI = settings.getString(PersistenceConf.JDBC_CONNECTION_URI);
+
+ // Loads the JDBC Driver in a separate class loader
+ Driver driver = getJdbcDriver(classLoader, className);
+
+ Properties properties = new Properties();
+ properties.put("user", settings.getString(PersistenceConf.JDBC_USERNAME));
+ properties.put("password", settings.getString(PersistenceConf.JDBC_PASSWORD));
+
+ // DBCP factory which will produce JDBC Driver instances
+ ConnectionFactory driverConnectionFactory = new DriverConnectionFactory(driver, connectURI, properties);
+
+ // DBCP Factory holding the pooled connection, which are created by the driver connection
+ // factory and held in the supplied pool
+ ObjectName dataSourceJmxName;
+ try {
+ dataSourceJmxName = new ObjectName("network.oxalis", "connectionPool", "OxalisDB");
+ } catch (MalformedObjectNameException e) {
+ throw new IllegalStateException(e.getMessage(), e);
+ }
+ PoolableConnectionFactory poolableConnectionFactory =
+ new PoolableConnectionFactory(driverConnectionFactory, dataSourceJmxName);
+
+ String validationQuery = settings.getString(PersistenceConf.DBCP_VALIDATION_QUERY);
+ if (validationQuery != null) {
+ poolableConnectionFactory.setValidationQuery(validationQuery);
+ }
+ // DBCP object pool holding our driver connections
+ GenericObjectPool genericObjectPool = new GenericObjectPool<>(poolableConnectionFactory);
+ poolableConnectionFactory.setPool(genericObjectPool);
+ genericObjectPool.setMaxTotal(settings.getInt(PersistenceConf.DBCP_MAX_TOTAL));
+ genericObjectPool.setMaxIdle(settings.getInt(PersistenceConf.DBCP_MAX_IDLE));
+ genericObjectPool.setMaxWaitMillis(10000);
+
+ // Test the connection returned from the pool
+ genericObjectPool.setTestOnBorrow(true);
+
+ // Test idle instances visited by the pool maintenance thread and destroy any that fail validation
+ genericObjectPool.setTestWhileIdle(true);
+
+ // Test every hour
+ genericObjectPool.setTimeBetweenEvictionRunsMillis(60 * 60 * 1000);
+
+ // Creates the actual DataSource instance
+ return new PoolingDataSource(genericObjectPool);
+ }
+
+ private static Driver getJdbcDriver(ClassLoader classLoader, String className) {
+ try {
+ return (Driver) Class.forName(className, true, classLoader).newInstance();
+ } catch (ClassNotFoundException e) {
+ throw new IllegalStateException("Unable to locate class " + className + ".", e);
+ } catch (InstantiationException e) {
+ throw new IllegalStateException("Unable to instantiate driver from class " + className, e);
+ } catch (IllegalAccessException e) {
+ throw new IllegalStateException("Unable to access driver class " + className + "; " + e, e);
+ }
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/datasource/JndiDataSourceProvider.java b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/datasource/JndiDataSourceProvider.java
new file mode 100644
index 0000000000000000000000000000000000000000..d6d5ea613f48ae91f0ad341127f146cdc7dbac58
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/datasource/JndiDataSourceProvider.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.datasource;
+
+import com.google.inject.Provider;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.api.settings.Settings;
+import network.oxalis.persistence.util.PersistenceConf;
+
+import javax.inject.Inject;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
+/**
+ * Provides an instance of {@link javax.sql.DataSource} using the configuration parameters found
+ * in {@link Settings}, which is located in OXALIS_HOME.
+ *
+ * @author steinar
+ * Date: 18.04.13
+ * Time: 13:28
+ * @author erlend
+ */
+@Slf4j
+public class JndiDataSourceProvider implements Provider {
+
+ private final Settings settings;
+
+ @Inject
+ public JndiDataSourceProvider(Settings settings) {
+ this.settings = settings;
+ }
+
+ @Override
+ public DataSource get() {
+ String dataSourceJndiName = settings.getString(PersistenceConf.JDBC_CONNECTION_URI);
+
+ log.debug("Obtaining data source from JNDI: {}", dataSourceJndiName);
+ try {
+ Context initCtx = new InitialContext();
+
+ return (DataSource) initCtx.lookup(dataSourceJndiName);
+ } catch (NamingException e) {
+ throw new IllegalStateException(
+ String.format("Unable to obtain JNDI datasource from '%s'.", dataSourceJndiName), e);
+ }
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/guice/AopJdbcTxManagerModule.java b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/guice/AopJdbcTxManagerModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..1cafaa8ae61c72c9d94fd2b79059ea02a674d150
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/guice/AopJdbcTxManagerModule.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.guice;
+
+import com.google.inject.Singleton;
+import com.google.inject.matcher.Matchers;
+import network.oxalis.commons.guice.OxalisModule;
+import network.oxalis.persistence.annotation.Repository;
+import network.oxalis.persistence.annotation.Transactional;
+import network.oxalis.persistence.aop.JdbcTxManagerImpl;
+import network.oxalis.persistence.aop.RepositoryConnectionMethodInterceptor;
+import network.oxalis.persistence.aop.TransactionalMethodInterceptor;
+import network.oxalis.persistence.api.JdbcTxManager;
+
+/**
+ * @author andy
+ * @author thore
+ */
+public class AopJdbcTxManagerModule extends OxalisModule {
+
+ @Override
+ protected void configure() {
+
+ // The tx Manager needs to be a singleton so that the same reference to the threadlocal containing the
+ // connection is shared amongst repositories etc.
+ bind(JdbcTxManager.class)
+ .to(JdbcTxManagerImpl.class)
+ .in(Singleton.class);
+
+ //creates the transactional method interceptor which handles methods annotated with @Transactional
+ final TransactionalMethodInterceptor transactionalMethodInterceptor = new TransactionalMethodInterceptor();
+
+ // Creates the method interceptor which handles methods annotated with @Repository
+ final RepositoryConnectionMethodInterceptor repositoryConnectionMethodInterceptor =
+ new RepositoryConnectionMethodInterceptor();
+
+ //injects the JdbcTxManager into the method interceptor for methods annotated with @Transactional.
+ requestInjection(transactionalMethodInterceptor);
+
+ //injects the JdbcTxManager into the method interceptor for methods annotated with @Repository
+ requestInjection(repositoryConnectionMethodInterceptor);
+
+ //makes individual methods in a class transactional.
+ bindInterceptor(Matchers.any(), Matchers.annotatedWith(Transactional.class), transactionalMethodInterceptor);
+
+ //makes all methods in the class transactional
+ bindInterceptor(Matchers.annotatedWith(Transactional.class), Matchers.any(),
+ transactionalMethodInterceptor);
+ bindInterceptor(Matchers.annotatedWith(Repository.class), Matchers.any(),
+ repositoryConnectionMethodInterceptor);
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/guice/DataSourceModule.java b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/guice/DataSourceModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..04a11a03afabf51a81290ac25586e110448a8e93
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/guice/DataSourceModule.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.guice;
+
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import com.google.inject.name.Names;
+import network.oxalis.api.settings.Settings;
+import network.oxalis.commons.guice.OxalisModule;
+import network.oxalis.commons.settings.SettingsBuilder;
+import network.oxalis.persistence.datasource.DbcpDataSourceProvider;
+import network.oxalis.persistence.datasource.JndiDataSourceProvider;
+import network.oxalis.persistence.util.PersistenceConf;
+
+import javax.sql.DataSource;
+
+/**
+ * Guice module providing a {@link DataSource} configured and bound to an SQL DBMS
+ * based upon the contents of a configuration file.
+ *
+ * @author steinar
+ * @author erlend
+ */
+public class DataSourceModule extends OxalisModule {
+
+ @Override
+ protected void configure() {
+ SettingsBuilder.with(binder(), PersistenceConf.class);
+
+ bind(Key.get(DataSource.class, Names.named("dbcp")))
+ .toProvider(DbcpDataSourceProvider.class)
+ .in(Singleton.class);
+
+ bind(Key.get(DataSource.class, Names.named("jndi")))
+ .toProvider(JndiDataSourceProvider.class)
+ .in(Singleton.class);
+ }
+
+ @Provides
+ @Singleton
+ protected DataSource dataSourceProvider(Injector injector, Settings settings) {
+ return injector.getInstance(
+ Key.get(DataSource.class, settings.getNamed(PersistenceConf.DATASOURCE)));
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/H2Platform.java b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/H2Platform.java
new file mode 100644
index 0000000000000000000000000000000000000000..b3fc719059d948078869b9f25979b7e2d65f5470
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/H2Platform.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.platform;
+
+import network.oxalis.persistence.api.Platform;
+
+/**
+ * @author erlend
+ */
+public class H2Platform implements Platform {
+
+ public static final String IDENTIFIER = "H2";
+
+ @Override
+ public boolean detect(String identifier) {
+ return identifier.toLowerCase().contains("h2");
+ }
+
+ @Override
+ public String getIdentifier() {
+ return IDENTIFIER;
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/HSQLDBPlatform.java b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/HSQLDBPlatform.java
new file mode 100644
index 0000000000000000000000000000000000000000..443ec0421f984eb311194312eab16eaf2df35fae
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/HSQLDBPlatform.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.platform;
+
+import network.oxalis.persistence.api.Platform;
+
+/**
+ * @author erlend
+ */
+public class HSQLDBPlatform implements Platform {
+
+ public static final String IDENTIFIER = "HSqlDB";
+
+ @Override
+ public boolean detect(String identifier) {
+ return identifier.toLowerCase().contains("hsql");
+ }
+
+ @Override
+ public String getIdentifier() {
+ return IDENTIFIER;
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/MsSQLPlatform.java b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/MsSQLPlatform.java
new file mode 100644
index 0000000000000000000000000000000000000000..160beaf657e1757701d609b1f99eefcf2112ebfd
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/MsSQLPlatform.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.platform;
+
+import network.oxalis.persistence.api.Platform;
+
+/**
+ * @author erlend
+ */
+public class MsSQLPlatform implements Platform {
+
+ public static final String IDENTIFIER = "MsSql";
+
+ @Override
+ public boolean detect(String identifier) {
+ return identifier.toLowerCase().contains("microsoft");
+ }
+
+ @Override
+ public String getIdentifier() {
+ return IDENTIFIER;
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/MySQLPlatform.java b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/MySQLPlatform.java
new file mode 100644
index 0000000000000000000000000000000000000000..7f383cc3269f5bbe1f5eb7f9438fa5ae660f16aa
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/MySQLPlatform.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.platform;
+
+import network.oxalis.persistence.api.Platform;
+
+/**
+ * @author erlend
+ */
+public class MySQLPlatform implements Platform {
+
+ public static final String IDENTIFIER = "MySQL";
+
+ @Override
+ public boolean detect(String identifier) {
+ return identifier.toLowerCase().contains("mysql");
+ }
+
+ @Override
+ public String getIdentifier() {
+ return IDENTIFIER;
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/OraclePlatform.java b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/OraclePlatform.java
new file mode 100644
index 0000000000000000000000000000000000000000..c07469d7e54062831b9b0e4b599f8246b6bf7b2c
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/OraclePlatform.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.platform;
+
+import network.oxalis.persistence.api.Platform;
+
+/**
+ * @author erlend
+ */
+public class OraclePlatform implements Platform {
+
+ public static final String IDENTIFIER = "Oracle";
+
+ @Override
+ public boolean detect(String identifier) {
+ return identifier.toLowerCase().contains("oracle");
+ }
+
+ @Override
+ public String getIdentifier() {
+ return IDENTIFIER;
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/PlatformModule.java b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/PlatformModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..507fada08c375bb83b17c4aa5714b8fe975b2808
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/PlatformModule.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.platform;
+
+import com.google.inject.Singleton;
+import com.google.inject.multibindings.Multibinder;
+import network.oxalis.commons.guice.OxalisModule;
+import network.oxalis.persistence.api.Platform;
+
+/**
+ * @author erlend
+ */
+public class PlatformModule extends OxalisModule {
+
+ @Override
+ protected void configure() {
+ Multibinder multibinder = Multibinder.newSetBinder(binder(), Platform.class);
+ multibinder.addBinding().to(H2Platform.class);
+ multibinder.addBinding().to(HSQLDBPlatform.class);
+ multibinder.addBinding().to(MySQLPlatform.class);
+ multibinder.addBinding().to(MsSQLPlatform.class);
+ multibinder.addBinding().to(OraclePlatform.class);
+
+ bind(Platform.class)
+ .toProvider(PlatformProvider.class)
+ .in(Singleton.class);
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/PlatformProvider.java b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/PlatformProvider.java
new file mode 100644
index 0000000000000000000000000000000000000000..ef579cd6c1345649e234e5e311ca4c6d958bb792
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/platform/PlatformProvider.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.platform;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import network.oxalis.api.lang.OxalisLoadingException;
+import network.oxalis.persistence.annotation.Repository;
+import network.oxalis.persistence.api.JdbcTxManager;
+import network.oxalis.persistence.api.Platform;
+
+import java.sql.SQLException;
+import java.util.Set;
+
+/**
+ * @author erlend
+ */
+@Repository
+class PlatformProvider implements Provider {
+
+ private JdbcTxManager jdbcTxManager;
+
+ private Set platforms;
+
+ @Inject
+ public PlatformProvider(JdbcTxManager jdbcTxManager, Set platforms) {
+ this.jdbcTxManager = jdbcTxManager;
+ this.platforms = platforms;
+ }
+
+ @Override
+ public Platform get() {
+ try {
+ String productName = jdbcTxManager.getConnection().getMetaData().getDatabaseProductName();
+
+ for (Platform platform : platforms)
+ if (platform.detect(productName))
+ return platform;
+
+ throw new OxalisLoadingException(String.format("Unable to load platform for '%s'.", productName));
+ } catch (SQLException e) {
+ throw new OxalisLoadingException("Unable to detect database platform.", e);
+ }
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/util/PersistenceConf.java b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/util/PersistenceConf.java
new file mode 100644
index 0000000000000000000000000000000000000000..df8e5837f34ee538cca479d22c14b90b8f13e887
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/java/network/oxalis/persistence/util/PersistenceConf.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.util;
+
+import network.oxalis.api.settings.*;
+
+/**
+ * @author erlend
+ * @since 4.0.0
+ */
+@Title("Persistence")
+public enum PersistenceConf {
+
+ @Path("oxalis.database.datasource")
+ @DefaultValue("dbcp")
+ DATASOURCE,
+
+ @Path("oxalis.database.driver.class")
+ @DefaultValue("org.h2.Driver")
+ DRIVER_CLASS,
+
+ @Path("oxalis.database.driver.path")
+ @Nullable
+ DRIVER_PATH,
+
+ @Path("oxalis.database.jdbc.connection")
+ @DefaultValue("jdbc:h2:file:./data/oxalis")
+ JDBC_CONNECTION_URI,
+
+ @Path("oxalis.database.jdbc.username")
+ @DefaultValue("sa")
+ JDBC_USERNAME,
+
+ @Path("oxalis.database.jdbc.password")
+ @DefaultValue("")
+ @Secret
+ JDBC_PASSWORD,
+
+ @Path("oxalis.database.jndi.resource")
+ @DefaultValue("jdbc/oxalis")
+ JNDI_RESOURCE,
+
+ @Path("oxalis.database.dbcp.max.idle")
+ @DefaultValue("30")
+ DBCP_MAX_IDLE,
+
+ @Path("oxalis.database.dbcp.max.total")
+ @DefaultValue("100")
+ DBCP_MAX_TOTAL,
+
+ @Path("oxalis.database.dbcp.validation")
+ @DefaultValue("select 1")
+ DBCP_VALIDATION_QUERY,
+
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/main/resources/reference.conf b/oxalis-legacy/oxalis-persistence/src/main/resources/reference.conf
new file mode 100644
index 0000000000000000000000000000000000000000..2da84a5bca2868a2472c9b45380b3d28d3370f11
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/main/resources/reference.conf
@@ -0,0 +1,3 @@
+oxalis.module.persistence.aop.class = network.oxalis.persistence.guice.AopJdbcTxManagerModule
+oxalis.module.persistence.datasource.class = network.oxalis.persistence.guice.DataSourceModule
+oxalis.module.persistence.platform.class = network.oxalis.persistence.platform.PlatformModule
diff --git a/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/datasource/DbcpDataSourceProviderTest.java b/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/datasource/DbcpDataSourceProviderTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..4c98ec3fb3456821f66ccf86bb410d4ab0e4be40
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/datasource/DbcpDataSourceProviderTest.java
@@ -0,0 +1,253 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.datasource;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.name.Named;
+import network.oxalis.api.settings.Settings;
+import network.oxalis.commons.filesystem.ClassLoaderUtils;
+import network.oxalis.persistence.testng.PersistenceModuleFactory;
+import network.oxalis.persistence.util.PersistenceConf;
+import org.apache.commons.dbcp2.*;
+import org.apache.commons.pool2.impl.GenericObjectPool;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.sql.DataSource;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.nio.file.Path;
+import java.sql.*;
+import java.util.Properties;
+
+import static org.testng.Assert.*;
+
+/**
+ * TODO Enable testing.
+ *
+ * @author steinar
+ * Date: 18.04.13
+ * Time: 14:08
+ */
+@Guice(moduleFactory = PersistenceModuleFactory.class)
+public class DbcpDataSourceProviderTest {
+
+ @Inject
+ private Provider dataSourceProvider;
+
+ @Inject
+ private Provider dataSourceProvider2;
+
+ @Inject
+ private Settings settings;
+
+ @Inject
+ @Named("home")
+ private Path homeFolder;
+
+ @BeforeClass
+ public void setUp() {
+ assertNotNull(settings);
+ }
+
+ @Test
+ public void oxalisDataSourceFactoryIsSingleton() throws Exception {
+
+ // Attempts to load the first instance of DataSourceProvider
+ assertNotNull(dataSourceProvider);
+
+ // Second invocation should return same instance
+ assertEquals(dataSourceProvider, dataSourceProvider2,
+ "Seems the Singleton pattern in DataSourceProviderFactory is not working");
+
+ // The datasource should also be the same instance
+ DataSource dataSource1 = dataSourceProvider.get();
+ assertNotNull(dataSource1);
+ DataSource dataSource2 = dataSourceProvider.get();
+
+ assertEquals(dataSource1, dataSource2,
+ dataSourceProvider.getClass().getSimpleName() + " is not returning a singleton instance of DataSource");
+
+ }
+
+ /**
+ * Verifies that we can create a pooled jdbc data source using the
+ * JDBC .jar-file supplied in the global configuration file.
+ */
+ @Test
+ public void testLoadJdbcDriverUsingCustomClassLoader() throws Exception {
+ ConnectionFactory driverConnectionFactory = createConnectionFactory(false);
+
+ ObjectName poolName = new ObjectName("network.oxalis", "connectionPool", "TestPool");
+ PoolableConnectionFactory factory = new PoolableConnectionFactory(driverConnectionFactory, poolName);
+
+ GenericObjectPool pool = new GenericObjectPool<>(factory);
+ factory.setPool(pool);
+
+ pool.setMaxTotal(10);
+ pool.setMaxWaitMillis(100);
+
+
+ assertEquals(pool.getFactory(), factory);
+
+ PoolableConnectionFactory pcf = (PoolableConnectionFactory) ((GenericObjectPool) pool).getFactory();
+ //ObjectPool pool1 =
+ pcf.getPool();
+
+ PoolingDataSource poolingDataSource = new PoolingDataSource<>(pool);
+
+ Connection connection = poolingDataSource.getConnection();
+ assertNotNull(connection);
+
+ Statement statement = connection.createStatement();
+ ResultSet resultSet = statement.executeQuery("select current_date()");
+
+ assertTrue(resultSet.next());
+ }
+
+
+ @Test
+ public void testFailWithStaleConnection() throws Exception {
+ ConnectionFactory driverConnectionFactory = createConnectionFactory(false);
+
+
+ PoolingDataSource poolingDataSource = createPoolingDataSource(driverConnectionFactory);
+ try {
+ runTwoSqlStatementsWithTwoConnections(poolingDataSource);
+ } catch (Exception e) {
+ assertTrue(e.getClass().getName().contains("CommunicationsException"));
+ }
+ }
+
+ @Test(enabled = false)
+ public void testHandleStaleConnections() throws Exception {
+ ConnectionFactory driverConnectionFactory = createConnectionFactory(true);
+
+ PoolingDataSource poolingDataSource = createPoolingDataSource(driverConnectionFactory);
+
+ runTwoSqlStatementsWithTwoConnections(poolingDataSource);
+ }
+
+ @Test
+ public void testBasicDataSource() throws Exception {
+
+ Path jdbcDriverClassPath = settings.getPath(PersistenceConf.DRIVER_PATH, homeFolder);
+ ClassLoader classLoader = ClassLoaderUtils.initiate(jdbcDriverClassPath);
+
+ BasicDataSource basicDataSource = new BasicDataSource();
+ basicDataSource.setDriverClassName(settings.getString(PersistenceConf.DRIVER_CLASS));
+ basicDataSource.setUrl(settings.getString(PersistenceConf.JDBC_CONNECTION_URI));
+ basicDataSource.setUsername(settings.getString(PersistenceConf.JDBC_USERNAME));
+ basicDataSource.setPassword(settings.getString(PersistenceConf.JDBC_PASSWORD));
+
+ // Does not work in 1.4, fixed in 1.4.1
+ basicDataSource.setDriverClassLoader(classLoader);
+
+ try {
+ Connection connection = basicDataSource.getConnection();
+ assertNotNull(connection);
+ } catch (SQLException e) {
+ // As expected when using DBCP 1.4
+ }
+ }
+
+ private void runTwoSqlStatementsWithTwoConnections(PoolingDataSource poolingDataSource)
+ throws SQLException, InterruptedException {
+
+ Connection connection = poolingDataSource.getConnection();
+ if (connection.getMetaData().getDatabaseProductName().toLowerCase().contains("mysql")) {
+ assertNotNull(connection);
+
+ Statement statement = connection.createStatement();
+ ResultSet resultSet = statement.executeQuery("select current_date()");
+
+ statement = connection.createStatement();
+ statement.execute("set session wait_timeout=1");
+ assertTrue(resultSet.next());
+
+ connection.close(); // return to pool
+
+ // Wait for 2 seconds
+ System.err.print("Sleeping for 2 seconds....");
+ Thread.sleep(2 * 1000L);
+ System.err.println("Running again now");
+ connection = poolingDataSource.getConnection();
+ statement = connection.createStatement();
+ statement.executeQuery("select current_time()");
+ }
+ }
+
+
+ private ConnectionFactory createConnectionFactory(boolean profileSql) throws MalformedURLException,
+ ClassNotFoundException, InstantiationException, IllegalAccessException, SQLException {
+ Path jdbcDriverClassPath = settings.getPath(PersistenceConf.DRIVER_PATH, homeFolder);
+
+ ClassLoader classLoader = ClassLoaderUtils.initiate(jdbcDriverClassPath);
+
+ String jdbcDriverClassName = settings.getString(PersistenceConf.DRIVER_CLASS);
+ URI connectURI = URI.create(settings.getString(PersistenceConf.JDBC_CONNECTION_URI)); // + "?initialTimeout=2";
+ String userName = settings.getString(PersistenceConf.JDBC_USERNAME);
+ String password = settings.getString(PersistenceConf.JDBC_PASSWORD);
+
+ Class aClass;
+ try {
+ aClass = Class.forName(jdbcDriverClassName, true, classLoader);
+ } catch (ClassNotFoundException e) {
+ throw new IllegalStateException(String.format(
+ "Unable to locate class '%s' in class path '%s'", jdbcDriverClassName, jdbcDriverClassPath));
+ }
+ Driver driver = (Driver) aClass.newInstance();
+ assertTrue(driver.acceptsURL(connectURI.toString()));
+
+ Properties properties = new Properties();
+ properties.put("user", userName);
+ properties.put("password", password);
+ if (profileSql) {
+ properties.put("profileSQL", "true"); // MySQL debug option
+ }
+ return new DriverConnectionFactory(driver, connectURI.toString(), properties);
+ }
+
+
+ @SuppressWarnings("unchecked")
+ private PoolingDataSource createPoolingDataSource(ConnectionFactory driverConnectionFactory) {
+
+ PoolableConnectionFactory poolableConnectionFactory;
+ try {
+
+ poolableConnectionFactory = new PoolableConnectionFactory(driverConnectionFactory,
+ new ObjectName("network.oxalis", "connectionPool", "TestPool"));
+
+ GenericObjectPool pool = new GenericObjectPool<>(poolableConnectionFactory);
+ poolableConnectionFactory.setPool(pool);
+ poolableConnectionFactory.setValidationQuery("select 1");
+ return new PoolingDataSource(pool);
+ } catch (MalformedObjectNameException e) {
+ throw new IllegalStateException("Unable to create poolable conneciton factory: " + e.getMessage(), e);
+ }
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/datasource/JndiDataSourceProviderTest.java b/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/datasource/JndiDataSourceProviderTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..a613406c13f07a512508e93a4e96a3a1ba9d9495
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/datasource/JndiDataSourceProviderTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.datasource;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.name.Named;
+import network.oxalis.persistence.testng.PersistenceModuleFactory;
+import org.testng.Assert;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import javax.sql.DataSource;
+
+/**
+ * @author erlend
+ */
+@Guice(moduleFactory = PersistenceModuleFactory.class)
+public class JndiDataSourceProviderTest {
+
+ @Inject
+ @Named("jndi")
+ private Provider dataSourceProvider;
+
+ @Test
+ public void simple() {
+ Assert.assertNotNull(dataSourceProvider);
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/datasource/SimpleDataSourceTest.java b/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/datasource/SimpleDataSourceTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..2cf22c80fdb440b952699a8d2afee80fbc6554b7
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/datasource/SimpleDataSourceTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.datasource;
+
+import com.google.inject.Inject;
+import network.oxalis.persistence.api.JdbcTxManager;
+import network.oxalis.persistence.testng.PersistenceModuleFactory;
+import org.testng.Assert;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import javax.sql.DataSource;
+
+/**
+ * @author erlend
+ */
+@Guice(moduleFactory = PersistenceModuleFactory.class)
+public class SimpleDataSourceTest {
+
+ @Inject
+ private DataSource dataSource;
+
+ @Inject
+ private JdbcTxManager jdbcTxManager;
+
+ @Test
+ public void simple() {
+ Assert.assertNotNull(dataSource);
+ Assert.assertNotNull(jdbcTxManager);
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/platform/PlatformModuleTest.java b/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/platform/PlatformModuleTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..3cfcc8ce60acf9a73d660c647dc796bd0ff53c5e
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/platform/PlatformModuleTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.platform;
+
+import com.google.inject.Inject;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import network.oxalis.persistence.api.Platform;
+import org.testng.Assert;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+@Guice(modules = GuiceModuleLoader.class)
+public class PlatformModuleTest {
+
+ @Inject
+ private Platform platform;
+
+ @Test
+ public void simple() {
+ Assert.assertTrue(platform instanceof H2Platform);
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/platform/PlatformProviderTest.java b/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/platform/PlatformProviderTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..3f91ec8798f2a29451038330ffbf86393eaded8c
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/platform/PlatformProviderTest.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.platform;
+
+import network.oxalis.api.lang.OxalisLoadingException;
+import network.oxalis.persistence.api.JdbcTxManager;
+import network.oxalis.persistence.api.Platform;
+import org.mockito.Mockito;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+import java.util.Collections;
+
+/**
+ * @author erlend
+ */
+public class PlatformProviderTest {
+
+ private JdbcTxManager jdbcTxManager;
+
+ private Connection connection;
+
+ private DatabaseMetaData databaseMetaData;
+
+ @BeforeClass
+ public void beforeMethod() {
+ jdbcTxManager = Mockito.mock(JdbcTxManager.class);
+ connection = Mockito.mock(Connection.class);
+ databaseMetaData = Mockito.mock(DatabaseMetaData.class);
+ }
+
+ @Test
+ public void simple() throws Exception {
+ Mockito.doReturn(connection).when(jdbcTxManager).getConnection();
+ Mockito.doReturn(databaseMetaData).when(connection).getMetaData();
+ Mockito.doReturn("H2").when(databaseMetaData).getDatabaseProductName();
+
+ Platform platform = new H2Platform();
+
+ PlatformProvider platformProvider = new PlatformProvider(jdbcTxManager, Collections.singleton(platform));
+
+ Assert.assertEquals(platformProvider.get(), platform);
+ }
+
+ @Test(expectedExceptions = OxalisLoadingException.class)
+ public void notFound() throws Exception {
+ Mockito.doReturn(connection).when(jdbcTxManager).getConnection();
+ Mockito.doReturn(databaseMetaData).when(connection).getMetaData();
+ Mockito.doReturn("MySQL").when(databaseMetaData).getDatabaseProductName();
+
+ Platform platform = new H2Platform();
+
+ PlatformProvider platformProvider = new PlatformProvider(jdbcTxManager, Collections.singleton(platform));
+
+ platformProvider.get();
+ }
+
+ @Test(expectedExceptions = OxalisLoadingException.class)
+ public void exception() throws Exception {
+ Mockito.doReturn(connection).when(jdbcTxManager).getConnection();
+ Mockito.doThrow(new SQLException()).when(connection).getMetaData();
+
+ Platform platform = new H2Platform();
+
+ PlatformProvider platformProvider = new PlatformProvider(jdbcTxManager, Collections.singleton(platform));
+
+ platformProvider.get();
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/platform/PlatformsTest.java b/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/platform/PlatformsTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..d6234c5199ef15538862c4192beffd60f9b8ae42
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/platform/PlatformsTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.platform;
+
+import network.oxalis.persistence.api.Platform;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+public class PlatformsTest {
+
+ @Test
+ public void h2() {
+ Platform platform = new H2Platform();
+
+ Assert.assertTrue(platform.detect("H2"));
+ Assert.assertFalse(platform.detect("MySQL"));
+
+ Assert.assertEquals(platform.getIdentifier(), H2Platform.IDENTIFIER);
+ Assert.assertEquals(platform.getNamed().value(), H2Platform.IDENTIFIER);
+ }
+
+ @Test
+ public void hsqldb() {
+ Platform platform = new HSQLDBPlatform();
+
+ Assert.assertTrue(platform.detect("HSqlDB"));
+ Assert.assertFalse(platform.detect("MySQL"));
+
+ Assert.assertEquals(platform.getIdentifier(), HSQLDBPlatform.IDENTIFIER);
+ }
+
+ @Test
+ public void mssql() {
+ Platform platform = new MsSQLPlatform();
+
+ Assert.assertFalse(platform.detect("H2"));
+ Assert.assertTrue(platform.detect("Microsoft"));
+
+ Assert.assertEquals(platform.getIdentifier(), MsSQLPlatform.IDENTIFIER);
+ }
+
+ @Test
+ public void mysql() {
+ Platform platform = new MySQLPlatform();
+
+ Assert.assertFalse(platform.detect("H2"));
+ Assert.assertTrue(platform.detect("MySQL"));
+
+ Assert.assertEquals(platform.getIdentifier(), MySQLPlatform.IDENTIFIER);
+ }
+
+ @Test
+ public void oracle() {
+ Platform platform = new OraclePlatform();
+
+ Assert.assertFalse(platform.detect("H2"));
+ Assert.assertTrue(platform.detect("Oracle"));
+
+ Assert.assertEquals(platform.getIdentifier(), OraclePlatform.IDENTIFIER);
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/testng/PersistenceModuleFactory.java b/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/testng/PersistenceModuleFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..f24c8041400774a1597317ca4a0d2ca1d75fb9c8
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/testng/PersistenceModuleFactory.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.testng;
+
+import com.google.inject.Key;
+import com.google.inject.Module;
+import com.google.inject.name.Names;
+import com.google.inject.util.Modules;
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+import network.oxalis.commons.filesystem.FileSystemModule;
+import network.oxalis.commons.guice.OxalisModule;
+import network.oxalis.persistence.guice.AopJdbcTxManagerModule;
+import network.oxalis.persistence.guice.DataSourceModule;
+import network.oxalis.test.config.TestConfigModule;
+import network.oxalis.test.filesystem.TestFileSystemModule;
+import org.testng.IModuleFactory;
+import org.testng.ITestContext;
+
+/**
+ * TestNG implementation of factory, which provides the Google Guice modules required
+ * for running the tests.
+ *
+ * @author steinar
+ * Date: 16.10.2016
+ * Time: 19.44
+ */
+public class PersistenceModuleFactory implements IModuleFactory {
+
+ public static final String CREATE_OXALIS_DBMS_H2_SQL = "/sql/raw_stats-h2.sql";
+
+ @Override
+ public Module createModule(ITestContext iTestContext, Class aClass) {
+ return new OxalisModule() {
+ @Override
+ protected void configure() {
+ install(new DataSourceModule());
+ install(new AopJdbcTxManagerModule());
+ install(new TestConfigModule());
+ install(Modules.override(new FileSystemModule()).with(new TestFileSystemModule()));
+ install(new OxalisModule() {
+ @Override
+ protected void configure() {
+ bind(Key.get(Config.class, Names.named("reference")))
+ .toInstance(ConfigFactory.defaultOverrides());
+ }
+ });
+ }
+ };
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/util/PersistenceConfTest.java b/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/util/PersistenceConfTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..a6c26320212dab73eea5c23c1eaf9e9a483a6fe4
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/test/java/network/oxalis/persistence/util/PersistenceConfTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.persistence.util;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author erlend
+ */
+public class PersistenceConfTest {
+
+ @Test
+ public void simple() {
+ Assert.assertEquals(PersistenceConf.valueOf("DATASOURCE"), PersistenceConf.DATASOURCE);
+ }
+}
diff --git a/oxalis-legacy/oxalis-persistence/src/test/resources/logback-test.xml b/oxalis-legacy/oxalis-persistence/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dda59efbd42a8c8df626806ae5f1909ad3795878
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/test/resources/logback-test.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/oxalis-legacy/oxalis-persistence/src/test/resources/oxalis_home/fake-oxalis.conf b/oxalis-legacy/oxalis-persistence/src/test/resources/oxalis_home/fake-oxalis.conf
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/oxalis-legacy/oxalis-persistence/src/test/resources/oxalis_home/logback-test.xml b/oxalis-legacy/oxalis-persistence/src/test/resources/oxalis_home/logback-test.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9ba0de5fc0e2ef9287cc084396a4efa80f319e31
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/test/resources/oxalis_home/logback-test.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+ %d %p [%c] %m %n
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oxalis-legacy/oxalis-persistence/src/test/resources/reference.conf b/oxalis-legacy/oxalis-persistence/src/test/resources/reference.conf
new file mode 100644
index 0000000000000000000000000000000000000000..a8dfccb68a1e970252d40ef48487b970d6ca150a
--- /dev/null
+++ b/oxalis-legacy/oxalis-persistence/src/test/resources/reference.conf
@@ -0,0 +1 @@
+defaults = {}
\ No newline at end of file
diff --git a/oxalis-legacy/oxalis-statistics/.gitignore b/oxalis-legacy/oxalis-statistics/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..249cda967c11bb62c8affe06d18f26bc5b5f3af0
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/.gitignore
@@ -0,0 +1 @@
+/data
\ No newline at end of file
diff --git a/oxalis-legacy/oxalis-statistics/pom.xml b/oxalis-legacy/oxalis-statistics/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ee8962ecbf0ebf474a5935991835977d6d7264b5
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/pom.xml
@@ -0,0 +1,93 @@
+
+
+
+
+
+ oxalis
+ dk.erst.oxalis
+ 0.9.0-e2f4121ccb55b5a60e6edebf7b28d277741d6789
+ ../../pom.xml
+
+ 4.0.0
+
+ oxalis-statistics
+
+ Oxalis :: Leg :: Statistics
+ Features to support gathering of statistics.
+ https://rep.erst.dk/git/openebusiness/nemhandeledelivery/oxalis
+
+
+ Erhvervsstyrelsen
+ https://nemhandel.dk/
+
+
+
+
+ dk.erst.oxalis
+ oxalis-persistence
+
+
+ dk.erst.oxalis
+ oxalis-test
+ test
+
+
+ dk.erst.oxalis
+ oxalis-persistence
+ test-jar
+ test
+
+
+ dk.erst.oxalis
+ oxalis-inbound
+ test
+
+
+
+
+ com.google.inject.extensions
+ guice-servlet
+ provided
+
+
+
+
+ joda-time
+ joda-time
+
+
+
+
+ javax.servlet
+ javax.servlet-api
+ provided
+
+
+
+
+ commons-codec
+ commons-codec
+
+
+
+
\ No newline at end of file
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/api/ChannelId.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/api/ChannelId.java
new file mode 100644
index 0000000000000000000000000000000000000000..262c4d14a8e775b94efb57bb884845e14e091ae4
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/api/ChannelId.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.api;
+
+import java.io.Serializable;
+
+/**
+ * @author Steinar Overbeck Cook
+ */
+public class ChannelId implements Serializable {
+
+ String value;
+
+ public ChannelId(String channelId) {
+ if (channelId == null) {
+ value = "";
+ } else
+ this.value = channelId;
+ }
+
+ public String stringValue() {
+ return toString();
+ }
+
+ @Override
+ public String toString() {
+ return value;
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/api/RawStatistics.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/api/RawStatistics.java
new file mode 100644
index 0000000000000000000000000000000000000000..8fc0e7d40f68c9c200052c7394810d3da4861d2d
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/api/RawStatistics.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.api;
+
+import network.oxalis.api.model.AccessPointIdentifier;
+import network.oxalis.api.model.Direction;
+import network.oxalis.vefa.peppol.common.model.DocumentTypeIdentifier;
+import network.oxalis.vefa.peppol.common.model.ParticipantIdentifier;
+import network.oxalis.vefa.peppol.common.model.ProcessIdentifier;
+
+import java.util.Date;
+
+/**
+ * @author erlend
+ */
+public interface RawStatistics {
+
+ ParticipantIdentifier getSender();
+
+ ParticipantIdentifier getReceiver();
+
+ Direction getDirection();
+
+ Date getDate();
+
+ AccessPointIdentifier getAccessPointIdentifier();
+
+ DocumentTypeIdentifier getDocumentTypeIdentifier();
+
+ ChannelId getChannelId();
+
+ ProcessIdentifier getProcessIdentifier();
+
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/api/RawStatisticsRepository.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/api/RawStatisticsRepository.java
new file mode 100644
index 0000000000000000000000000000000000000000..2e04fe4ccc274f46bcc6568147fd02a8af2c757c
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/api/RawStatisticsRepository.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.api;
+
+import java.util.Date;
+
+/**
+ * Objects implementing this interface are capable of storing and retrieving raw data
+ * pertaining to the sending and receiving of PEPPOL messages in order to provide statistics.
+ *
+ * User: steinar
+ * Date: 30.01.13
+ * Time: 19:28
+ */
+public interface RawStatisticsRepository {
+
+ /**
+ * Persists another raw statistics entry into table {@code raw_stats}
+ */
+ Integer persist(RawStatistics rawStatistics);
+
+ /**
+ * Retrieves data from table raw_stats and transforms it into an appropriate XML document
+ */
+ void fetchAndTransformRawStatistics(StatisticsTransformer transformer, Date start, Date end,
+ StatisticsGranularity granularity);
+
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/api/StatisticsGranularity.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/api/StatisticsGranularity.java
new file mode 100644
index 0000000000000000000000000000000000000000..236d1761ce9ae71ad35da1c309dbd81a81add3c3
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/api/StatisticsGranularity.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.api;
+
+/**
+ * Represents granularity of statistics data.
+ *
+ * @author steinar
+ * Date: 26.03.13
+ * Time: 09:17
+ */
+public enum StatisticsGranularity {
+
+ YEAR("Y"),MONTH("M"), DAY("D"), HOUR("H");
+
+ private final String abbreviation;
+
+ StatisticsGranularity(String abbreviation) {
+ this.abbreviation = abbreviation;
+ }
+
+ public String getAbbreviation() {
+ return abbreviation;
+ }
+
+ public static StatisticsGranularity valueForAbbreviation(String abbreviation) {
+ if (abbreviation == null) {
+ throw new IllegalArgumentException("null string is an invalid abbreviation for statistics granularity");
+ }
+
+ for (StatisticsGranularity granularity : values()) {
+ if (granularity.abbreviation.equalsIgnoreCase(abbreviation)) {
+ return granularity;
+ }
+ }
+
+ throw new IllegalArgumentException("Invalid abbreviation for statistics granularity: " + abbreviation);
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/api/StatisticsTransformer.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/api/StatisticsTransformer.java
new file mode 100644
index 0000000000000000000000000000000000000000..ca47ae9259353e5d1e9d298f3e30a95cbe9807b0
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/api/StatisticsTransformer.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.api;
+
+import java.util.Date;
+
+/**
+ * Transforms aggregated statistics into another format. This interface has been designed to maximize performance
+ * when transforming the results from the statistics repository into whatever format the implementor of this
+ * interface has choosen. I.e. transformation from SQL ResultSet to XML, which will not require any new objects to
+ * be created.
+ *
+ *
To use it:
+ *
+ * - Invoke {@link #startEntry()} first
+ * - Invoke the writeXxxx methods for each field
+ * - Complete the entry by calling {@link #endEntry()}
+ *
+ *
+ * User: steinar
+ * Date: 24.02.13
+ * Time: 10:27
+ */
+public interface StatisticsTransformer {
+
+ String STATISTICS_DOCUMENT_START_ELEMENT_NAME = "peppol-ap-statistics";
+ String ENTRY_START_ELEMENT_NAME = "entry";
+ String ACCESS_POINT_ID_ELEMENT_NAME = "access-point-id";
+ String PARTICIPANT_ID_ELEMENT_NAME = "participant-id";
+ String DOCUMENT_TYPE_ELEMENT_NAME = "document-type";
+ String PROFILE_ID_ELEMENT_NAME = "profile-id";
+ String CHANNEL_ELEMENT_NAME = "channel";
+ String COUNT_ELEMENT_NAME = "count";
+ String PERIOD_ELEMENT_NAME = "period";
+ String DIRECTION_ELEMENT_NAME = "direction";
+
+ void startStatistics(Date start, Date end);
+
+ /** Invoked by the transformer upon the start of a new entry (row, line, etc.) of statistical data */
+ void startEntry();
+
+ void writeAccessPointIdentifier(String accessPointIdentifier);
+
+ void writePeriod(String period);
+
+ void writeDirection(String direction);
+
+ void writeParticipantIdentifier(String participantId);
+
+ void writeDocumentType(String documentType);
+
+ void writeProfileId(String profileId);
+
+ void writeChannel(String channel);
+
+ void writeCount(int count);
+
+ /** Completes the current statistics entry */
+ void endEntry();
+
+ void endStatistics();
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/guice/RawStatisticsRepositoryModule.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/guice/RawStatisticsRepositoryModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..eb8d3671926efa4aae527b04d0def2ed6d7bb370
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/guice/RawStatisticsRepositoryModule.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.guice;
+
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import com.google.inject.name.Names;
+import network.oxalis.commons.guice.OxalisModule;
+import network.oxalis.persistence.api.Platform;
+import network.oxalis.persistence.guice.AopJdbcTxManagerModule;
+import network.oxalis.persistence.platform.*;
+import network.oxalis.statistics.jdbc.RawStatisticsRepositoryHSqlImpl;
+import network.oxalis.statistics.jdbc.RawStatisticsRepositoryMySqlImpl;
+import network.oxalis.statistics.api.RawStatisticsRepository;
+import network.oxalis.statistics.jdbc.RawStatisticsRepositoryMsSqlImpl;
+import network.oxalis.statistics.jdbc.RawStatisticsRepositoryOracleImpl;
+
+/**
+ * Wires up the persistence component.
+ *
+ * NOTE! When creating an injector, remember to supply an instance of {@link javax.sql.DataSource}
+ *
+ * @author steinar
+ * Date: 25.10.2016
+ * Time: 21.43
+ */
+public class RawStatisticsRepositoryModule extends OxalisModule {
+
+ @Override
+ protected void configure() {
+ // Includes the Aop based Tx manager, which needs a DataSource
+ binder().install(new AopJdbcTxManagerModule());
+
+ bind(Key.get(RawStatisticsRepository.class, Names.named(H2Platform.IDENTIFIER)))
+ .to(RawStatisticsRepositoryMsSqlImpl.class);
+
+ bind(Key.get(RawStatisticsRepository.class, Names.named(MySQLPlatform.IDENTIFIER)))
+ .to(RawStatisticsRepositoryMySqlImpl.class);
+
+ bind(Key.get(RawStatisticsRepository.class, Names.named(MsSQLPlatform.IDENTIFIER)))
+ .to(RawStatisticsRepositoryMsSqlImpl.class);
+
+ bind(Key.get(RawStatisticsRepository.class, Names.named(OraclePlatform.IDENTIFIER)))
+ .to(RawStatisticsRepositoryOracleImpl.class);
+
+ bind(Key.get(RawStatisticsRepository.class, Names.named(HSQLDBPlatform.IDENTIFIER)))
+ .to(RawStatisticsRepositoryHSqlImpl.class);
+ }
+
+ @Provides
+ @Singleton
+ public RawStatisticsRepository get(Injector injector, Platform platform) {
+ return injector.getInstance(Key.get(RawStatisticsRepository.class, platform.getNamed()));
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/inbound/StatisticsInboundModule.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/inbound/StatisticsInboundModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..7e48d575a8d5b0b6f741e5c055adeaf71239862a
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/inbound/StatisticsInboundModule.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.inbound;
+
+import com.google.inject.servlet.ServletModule;
+
+/**
+ * @author erlend
+ */
+public class StatisticsInboundModule extends ServletModule {
+
+ @Override
+ protected void configureServlets() {
+ serve("/statistics/*").with(StatisticsServlet.class);
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/inbound/StatisticsProducer.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/inbound/StatisticsProducer.java
new file mode 100644
index 0000000000000000000000000000000000000000..4d521a73508f1b02556bbd37b13e4cd4dd19936f
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/inbound/StatisticsProducer.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.inbound;
+
+import com.google.inject.Inject;
+import network.oxalis.statistics.api.RawStatisticsRepository;
+import network.oxalis.statistics.api.StatisticsGranularity;
+import network.oxalis.statistics.util.StatisticsToXmlTransformer;
+
+import java.io.OutputStream;
+import java.util.Date;
+
+/**
+ * User: steinar
+ * Date: 23.02.13
+ * Time: 21:49
+ */
+public class StatisticsProducer {
+
+ private final RawStatisticsRepository rawStatisticsRepository;
+
+ @Inject
+ public StatisticsProducer(RawStatisticsRepository rawStatisticsRepository) {
+ this.rawStatisticsRepository = rawStatisticsRepository;
+ }
+
+ public void emitData(OutputStream outputStream, Date start, Date end, StatisticsGranularity granularity) {
+ StatisticsToXmlTransformer statisticsToXmlTransformer = new StatisticsToXmlTransformer(outputStream);
+
+ rawStatisticsRepository.fetchAndTransformRawStatistics(statisticsToXmlTransformer, start, end, granularity);
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/inbound/StatisticsServlet.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/inbound/StatisticsServlet.java
new file mode 100644
index 0000000000000000000000000000000000000000..5f22049858f347c896cdf4a47680806e77cdc4d8
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/inbound/StatisticsServlet.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.inbound;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import network.oxalis.statistics.api.StatisticsGranularity;
+import network.oxalis.statistics.security.OxalisCipher;
+import network.oxalis.statistics.security.OxalisCipherConverter;
+import network.oxalis.statistics.security.StatisticsKeyTool;
+import org.joda.time.DateTime;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.security.PublicKey;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * There are only 3 parameters, start, end and granularity - like this :
+ * {@literal https://your.accesspoint.com/oxalis/statistics?start=2013-01-01T00&end=2014-02-01T00&granularity=H}
+ *
+ * The start/end are dates are ISO formatted like : yyyy-mm-ddThh
+ * The granularity can be H (hour), D (day), M (month) and Y (year), for reference {@link StatisticsGranularity}
+ *
+ * @author steinar
+ * @author thore
+ */
+@Singleton
+public class StatisticsServlet extends HttpServlet {
+
+ @Inject
+ private StatisticsProducer statisticsProducer;
+
+ private PublicKey publicKey;
+
+ @Inject
+ private StatisticsKeyTool statisticsKeyTool;
+
+ @Override
+ public void init(ServletConfig servletConfig) {
+ // Loads our asymmetric public key
+ publicKey = statisticsKeyTool.loadPublicKeyFromClassPath();
+ }
+
+ protected void doPost(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ response.getOutputStream().write("Hello!\nOxalis statistics does not support http POST".getBytes());
+ }
+
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ Map parameterMap = request.getParameterMap();
+
+ Params params = parseParams(parameterMap);
+
+ // Need the output stream for emission of XML
+ ServletOutputStream servletOutputStream = response.getOutputStream();
+
+ // Encryption of the output stream
+ OxalisCipher oxalisCipher = new OxalisCipher();
+
+ // Returns the symmetric key used in the Cipher, wrapped with the public key
+ String wrappedSymmetricKeyAsString = new OxalisCipherConverter()
+ .getWrappedSymmetricKeyAsString(publicKey, oxalisCipher);
+ response.setHeader(OxalisCipher.WRAPPED_SYMMETRIC_KEY_HEADER_NAME, wrappedSymmetricKeyAsString);
+
+ // wraps the servlet output stream with encryption
+ OutputStream encryptedOutputStream = oxalisCipher.encryptStream(servletOutputStream);
+
+ // Retrieves the data from the DBMS and emits the XML thru the encryped stream
+ statisticsProducer.emitData(encryptedOutputStream, params.start, params.end, params.granularity);
+
+ encryptedOutputStream.close();
+ }
+
+ Params parseParams(Map parameterMap) {
+ Params result = new Params();
+ parseGranularity(parameterMap, result);
+ parseDates(parameterMap, result);
+ return result;
+ }
+
+ private void parseDates(Map parameterMap, Params result) {
+ result.start = parseDate(getParamFromMultiValues(parameterMap, "start"));
+ result.end = parseDate(getParamFromMultiValues(parameterMap, "end"));
+ }
+
+ private void parseGranularity(Map parameterMap, Params result) {
+ String granularity = getParamFromMultiValues(parameterMap, "g");
+ if (granularity == null) {
+ granularity = getParamFromMultiValues(parameterMap, "granularity");
+ }
+ if (granularity == null) {
+ throw new IllegalArgumentException("Missing request parameter: 'granularity' (Y,M,D or H)");
+ } else {
+ result.granularity = StatisticsGranularity.valueForAbbreviation(granularity);
+ }
+ }
+
+ String getParamFromMultiValues(Map parameterMap, String key) {
+ String[] values = parameterMap.get(key);
+ if (values != null && values.length > 0) {
+ return values[0];
+ } else {
+ return null;
+ }
+ }
+
+ private Date parseDate(String dateAsString) {
+ if (dateAsString != null) {
+ try {
+ // JODA time is really the king of date and time parsing :-)
+ DateTime date = DateTime.parse(dateAsString);
+ return date.toDate();
+ } catch (Exception e) {
+ throw new IllegalStateException(String.format(
+ "Unable to parseMultipart '%s'into a date and time using ISO8601 pattern YYYY-MM-DD HH",
+ dateAsString));
+ }
+ }
+ return null;
+ }
+
+ static class Params {
+ Date start;
+
+ Date end;
+
+ StatisticsGranularity granularity;
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryHSqlImpl.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryHSqlImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..433977017f89979f8498ebb17c6c6680282cd256
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryHSqlImpl.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.jdbc;
+
+import network.oxalis.persistence.api.JdbcTxManager;
+import network.oxalis.persistence.annotation.Repository;
+import network.oxalis.statistics.util.DataSourceHelper;
+import network.oxalis.statistics.util.JdbcHelper;
+import network.oxalis.statistics.api.StatisticsGranularity;
+import network.oxalis.statistics.api.StatisticsTransformer;
+
+import javax.inject.Inject;
+import java.sql.*;
+import java.util.Date;
+
+/**
+ * This is RawStatisticsRepository implementation for running the statistics database on MySql backend, through JDBC.
+ *
+ * @author steinar
+ * @author zeko78
+ */
+@Repository
+public class RawStatisticsRepositoryHSqlImpl extends RawStatisticsRepositoryJdbcImpl {
+
+ @Inject
+ public RawStatisticsRepositoryHSqlImpl(JdbcTxManager jdbcTxManager) {
+ super(jdbcTxManager);
+ }
+
+ /**
+ * Composes the SQL query to persist raw statistics into the DBMS.
+ */
+ @Override
+ public String getPersistSqlQueryText() {
+ return String.format("INSERT INTO %s (ap, tstamp, direction, sender, receiver, doc_type, profile, channel) values(?,?,?,?,?,?,?,?)", RawStatisticsRepositoryJdbcImpl.RAW_STATS_TABLE_NAME);
+ }
+
+ /**
+ * Composes the SQL query for retrieval of statistical data between a start and end data, with
+ * a granularity as supplied.
+ *
+ * @param granularity the granularity of the statics period reported.
+ */
+ @Override
+ public String getRawStatisticsSqlQueryText(StatisticsGranularity granularity) {
+ String hSqlDateFormat = hSqlDateFormat(granularity);
+ return "SELECT\n" +
+ " ap,\n" +
+ " 'OUT' AS direction,\n" +
+ " TO_CHAR(tstamp,'" + hSqlDateFormat + "') AS period,\n" +
+ " sender AS ppid,\n" +
+ " doc_type,\n" +
+ " profile,\n" +
+ " channel,\n" +
+ " COUNT(id) AS c\n" +
+ "FROM\n" +
+ " raw_stats\n" +
+ "WHERE\n" +
+ " direction = 'OUT'\n" +
+ " and tstamp between ? and ?\n" +
+ "GROUP BY ap,direction,period,ppid,doc_type,profile,channel\n" +
+ "union\n" +
+ "SELECT\n" +
+ " ap,\n" +
+ " 'IN' AS direction,\n" +
+ " TO_CHAR(tstamp,'" + hSqlDateFormat + "') AS period,\n" +
+ " receiver AS ppid,\n" +
+ " doc_type,\n" +
+ " profile,\n" +
+ " channel,\n" +
+ " COUNT(id) AS c\n" +
+ "FROM\n" +
+ " raw_stats\n" +
+ "WHERE\n" +
+ " direction = 'IN'\n" +
+ " and tstamp between ? and ?\n" +
+ "\n" +
+ "GROUP BY ap,direction,period,ppid,doc_type,profile,channel\n" +
+ "order by period, ap\n" +
+ ";";
+ }
+
+ /**
+ * Retrieves statistics and transforms it using the supplied transformer.
+ */
+ @Override
+ public void fetchAndTransformRawStatistics(StatisticsTransformer transformer, Date start, Date end, StatisticsGranularity granularity) {
+
+ String sql = this.getRawStatisticsSqlQueryText(granularity);
+
+ start = JdbcHelper.setStartDateIfNull(start);
+ end = JdbcHelper.setEndDateIfNull(end);
+
+ Connection con = null;
+ PreparedStatement ps;
+ try {
+ con = jdbcTxManager.getConnection();
+ ps = con.prepareStatement(sql);
+
+ // Sets the start and end parameters for both parts of the SELECT UNION
+ ps.setTimestamp(1, new Timestamp(start.getTime()));
+ ps.setTimestamp(2, new Timestamp(end.getTime()));
+ ps.setTimestamp(3, new Timestamp(start.getTime()));
+ ps.setTimestamp(4, new Timestamp(end.getTime()));
+ ResultSet rs = ps.executeQuery();
+
+ transformer.startStatistics(start, end);
+ while (rs.next()) {
+ transformer.startEntry();
+ transformer.writeAccessPointIdentifier(rs.getString("ap"));
+ transformer.writeDirection(rs.getString("direction"));
+ transformer.writePeriod(rs.getString("period"));
+ transformer.writeParticipantIdentifier(rs.getString("ppid"));
+ transformer.writeDocumentType(rs.getString("doc_type"));
+ transformer.writeProfileId(rs.getString("profile"));
+ transformer.writeChannel(rs.getString("channel"));
+ transformer.writeCount(rs.getInt("c"));
+ transformer.endEntry();
+ }
+ transformer.endStatistics();
+ } catch (SQLException e) {
+ throw new IllegalStateException("SQL error:" + e, e);
+ } finally {
+ DataSourceHelper.close(con);
+ }
+ }
+
+ /**
+ * Return the correct date_format parameter for the chosen granularity
+ */
+ static String hSqlDateFormat(StatisticsGranularity granularity) {
+ switch (granularity) {
+ case YEAR:
+ return "YY";
+ case MONTH:
+ return "YY-MM";
+ case DAY:
+ return "YY-MM-DD";
+ case HOUR:
+ return "YY-MM-DD\"T\"HH24";
+ default:
+ throw new IllegalArgumentException("Unable to convert " + granularity + " into a MySQL date_format() string");
+ }
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryJdbcImpl.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryJdbcImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..0c688b35f19c316492bc167fc15d6e14e7f5b62b
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryJdbcImpl.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.jdbc;
+
+import network.oxalis.persistence.api.JdbcTxManager;
+import network.oxalis.statistics.util.DataSourceHelper;
+import network.oxalis.statistics.util.JdbcHelper;
+import network.oxalis.statistics.api.RawStatistics;
+import network.oxalis.statistics.api.RawStatisticsRepository;
+import network.oxalis.statistics.api.StatisticsGranularity;
+import network.oxalis.statistics.api.StatisticsTransformer;
+
+import java.sql.*;
+import java.util.Date;
+
+/**
+ * Basic JDBC implementation of StatisticsRepository component supplied with Oxalis.
+ * In theory, you may use any implementation of StatisticsRepository you like,
+ * however; in real life, most people will probably stick with the SQL database.
+ *
+ * @author steinar
+ */
+public abstract class RawStatisticsRepositoryJdbcImpl implements RawStatisticsRepository {
+
+ public static final String RAW_STATS_TABLE_NAME = "raw_stats";
+
+ protected final JdbcTxManager jdbcTxManager;
+
+ public RawStatisticsRepositoryJdbcImpl(JdbcTxManager jdbcTxManager) {
+ this.jdbcTxManager = jdbcTxManager;
+ }
+
+ /**
+ * Persists raw statistics into the DBMS via JDBC, no caching is utilized.
+ */
+ @Override
+ public Integer persist(RawStatistics rawStatistics) {
+ Connection con = null;
+ PreparedStatement ps;
+ Integer result = 0;
+ try {
+
+ String sqlStatement = this.getPersistSqlQueryText();
+ con = jdbcTxManager.getConnection();
+ ps = con.prepareStatement(sqlStatement, Statement.RETURN_GENERATED_KEYS);
+
+ ps.setString(1, rawStatistics.getAccessPointIdentifier().toString());
+ ps.setTimestamp(2, new Timestamp(rawStatistics.getDate().getTime()));
+ ps.setString(3, rawStatistics.getDirection().toString());
+ ps.setString(4, rawStatistics.getSender().getIdentifier());
+ ps.setString(5, rawStatistics.getReceiver().getIdentifier());
+ ps.setString(6, rawStatistics.getDocumentTypeIdentifier().toString());
+ ps.setString(7, rawStatistics.getProcessIdentifier().toString());
+ ps.setString(8, rawStatistics.getChannelId() == null ? null : rawStatistics.getChannelId().stringValue());
+
+ ps.executeUpdate();
+ ResultSet rs = ps.getGeneratedKeys();
+ if (rs.next()) {
+ result = rs.getInt(1);
+ rs.close();
+ }
+
+ } catch (SQLException e) {
+ throw new IllegalStateException("Unable to execute statement " + e, e);
+ } finally {
+ DataSourceHelper.close(con);
+ }
+ return result;
+ }
+
+ /**
+ * Retrieves statistics and transforms it using the supplied transformer.
+ */
+ @Override
+ public void fetchAndTransformRawStatistics(StatisticsTransformer transformer, Date start, Date end, StatisticsGranularity granularity) {
+
+ String sql = this.getRawStatisticsSqlQueryText(granularity);
+
+ start = JdbcHelper.setStartDateIfNull(start);
+ end = JdbcHelper.setEndDateIfNull(end);
+
+ Connection con = null;
+ PreparedStatement ps;
+ try {
+ con = jdbcTxManager.getConnection();
+ ps = con.prepareStatement(sql);
+
+ // Sets the start and end parameters for both parts of the SELECT UNION
+ ps.setTimestamp(1, new Timestamp(start.getTime()));
+ ps.setTimestamp(2, new Timestamp(end.getTime()));
+ ps.setTimestamp(3, new Timestamp(start.getTime()));
+ ps.setTimestamp(4, new Timestamp(end.getTime()));
+ ResultSet rs = ps.executeQuery();
+
+ transformer.startStatistics(start, end);
+ while (rs.next()) {
+ transformer.startEntry();
+ transformer.writeAccessPointIdentifier(rs.getString("ap"));
+ transformer.writeDirection(rs.getString("direction"));
+ transformer.writePeriod(rs.getString("period"));
+ transformer.writeParticipantIdentifier(rs.getString("ppid"));
+ transformer.writeDocumentType(rs.getString("doc_type"));
+ transformer.writeProfileId(rs.getString("profile"));
+ transformer.writeChannel(rs.getString("channel"));
+ transformer.writeCount(rs.getInt("count"));
+ transformer.endEntry();
+ }
+ transformer.endStatistics();
+ } catch (SQLException e) {
+ throw new IllegalStateException("SQL error:" + e, e);
+ } finally {
+ DataSourceHelper.close(con);
+ }
+ }
+
+ /**
+ * Composes the SQL query to persist raw statistics into the DBMS.
+ */
+ abstract String getPersistSqlQueryText();
+
+ /**
+ * Composes the SQL query for retrieval of statistical data between a start and end data,
+ * with a granularity as supplied.
+ *
+ * @param granularity the granularity of the statics period reported.
+ */
+ abstract String getRawStatisticsSqlQueryText(StatisticsGranularity granularity);
+
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryMsSqlImpl.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryMsSqlImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..333bc745f40bca33f9928973510f0009ea22ee89
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryMsSqlImpl.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.jdbc;
+
+import network.oxalis.persistence.annotation.Repository;
+import network.oxalis.persistence.api.JdbcTxManager;
+import network.oxalis.statistics.api.StatisticsGranularity;
+
+import javax.inject.Inject;
+
+/**
+ * This is RawStatisticsRepository implementation for running the statistics database on MsSql backend, through Jdbc.
+ *
+ * @author zeko78
+ */
+@Repository
+public class RawStatisticsRepositoryMsSqlImpl extends RawStatisticsRepositoryJdbcImpl {
+
+ @Inject
+ public RawStatisticsRepositoryMsSqlImpl(JdbcTxManager jdbcTxManager) {
+ super(jdbcTxManager);
+ }
+
+ /**
+ * Composes the SQL query to persist raw statistics into the DBMS.
+ */
+ String getPersistSqlQueryText() {
+ return String.format("INSERT INTO %s (ap, tstamp, direction, sender, receiver, doc_type, profile, channel) " +
+ "values(?,?,?,?,?,?,?,?)", RawStatisticsRepositoryJdbcImpl.RAW_STATS_TABLE_NAME);
+ }
+
+ /**
+ * Composes the SQL query for retrieval of statistical data between a start and end data, with
+ * a granularity as supplied.
+ *
+ * @param granularity the granularity of the statics period reported.
+ */
+ String getRawStatisticsSqlQueryText(StatisticsGranularity granularity) {
+ String granularityQuery = granularityQuery(granularity);
+ String sql = "SELECT\n" +
+ " ap,\n" +
+ " 'OUT' direction,\n" +
+ " " + granularityQuery + " period,\n" +
+ " sender ppid,\n" +
+ " doc_type,\n" +
+ " profile,\n" +
+ " channel,\n" +
+ " COUNT(*) count\n" +
+ "FROM\n" +
+ " raw_stats\n" +
+ "WHERE\n" +
+ " direction = 'OUT'\n" +
+ " and tstamp between ? and ?\n" +
+ "GROUP BY ap,direction," + granularityQuery + ",sender,doc_type,profile,channel\n" +
+ "union\n" +
+ "SELECT\n" +
+ " ap,\n" +
+ " 'IN' direction,\n" +
+ " " + granularityQuery + " period,\n" +
+ " receiver ppid,\n" +
+ " doc_type,\n" +
+ " profile,\n" +
+ " channel,\n" +
+ " COUNT(*) count\n" +
+ "FROM\n" +
+ " raw_stats\n" +
+ "WHERE\n" +
+ " direction = 'IN'\n" +
+ " and tstamp between ? and ?\n" +
+ "\n" +
+ "GROUP BY ap,direction," + granularityQuery + ",receiver,doc_type,profile,channel\n" +
+ "order by period, ap\n" +
+ ";";
+
+ return sql;
+ }
+
+ /**
+ * Return the currect date_format parameter for the chosen granularity
+ */
+ static String granularityQuery(StatisticsGranularity granularity) {
+ switch (granularity) {
+ case YEAR:
+ return "LEFT(CONVERT(VARCHAR, CONVERT(datetime, tstamp, 121), 121), 4)";
+ case MONTH:
+ return "LEFT(CONVERT(VARCHAR, CONVERT(datetime, tstamp, 121), 121), 7)";
+ case DAY:
+ return "LEFT(CONVERT(VARCHAR, CONVERT(datetime, tstamp, 121), 121), 10)";
+ case HOUR:
+ return "REPLACE(LEFT(CONVERT(VARCHAR, CONVERT(datetime, tstamp, 121), 121), 13), ' ', 'T')";
+ default:
+ throw new IllegalArgumentException(String.format(
+ "Unable to convert '%s' into a MsSQL function string", granularity));
+ }
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryMySqlImpl.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryMySqlImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..68d08e19006d8bcc1e649fa9e9c47de09c49ed40
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryMySqlImpl.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.jdbc;
+
+import network.oxalis.persistence.api.JdbcTxManager;
+import network.oxalis.persistence.annotation.Repository;
+import network.oxalis.statistics.api.StatisticsGranularity;
+
+import javax.inject.Inject;
+
+/**
+ * This is RawStatisticsRepository implementation for running the statistics database on MySql backend, through JDBC.
+ *
+ * @author steinar
+ * @author zeko78
+ */
+@Repository
+public class RawStatisticsRepositoryMySqlImpl extends RawStatisticsRepositoryJdbcImpl {
+
+ @Inject
+ public RawStatisticsRepositoryMySqlImpl(JdbcTxManager jdbcTxManager) {
+ super(jdbcTxManager);
+ }
+
+ /**
+ * Composes the SQL query to persist raw statistics into the DBMS.
+ */
+ @Override
+ String getPersistSqlQueryText() {
+ return String.format("INSERT INTO %s (ap, tstamp, direction, sender, receiver, doc_type, profile, channel) " +
+ "values(?,?,?,?,?,?,?,?)", RawStatisticsRepositoryJdbcImpl.RAW_STATS_TABLE_NAME);
+ }
+
+ /**
+ * Composes the SQL query for retrieval of statistical data between a start and end data, with
+ * a granularity as supplied.
+ *
+ * @param granularity the granularity of the statics period reported.
+ */
+ @Override
+ String getRawStatisticsSqlQueryText(StatisticsGranularity granularity) {
+ String mySqlDateFormat = mySqlDateFormat(granularity);
+ return "SELECT\n" +
+ " ap,\n" +
+ " 'OUT' direction,\n" +
+ " date_format(tstamp,'" + mySqlDateFormat + "') period,\n" +
+ " sender ppid,\n" +
+ " doc_type,\n" +
+ " profile,\n" +
+ " channel,\n" +
+ " COUNT(*) count\n" +
+ "FROM\n" +
+ " raw_stats\n" +
+ "WHERE\n" +
+ " direction = 'OUT'\n" +
+ " and tstamp between ? and ?\n" +
+ "GROUP BY 1,2,3,4,5,6,7\n" +
+ "union\n" +
+ "SELECT\n" +
+ " ap,\n" +
+ " 'IN' direction,\n" +
+ " date_format(tstamp,'" + mySqlDateFormat + "') period,\n" +
+ " receiver ppid,\n" +
+ " doc_type,\n" +
+ " profile,\n" +
+ " channel,\n" +
+ " COUNT(*) count\n" +
+ "FROM\n" +
+ " raw_stats\n" +
+ "WHERE\n" +
+ " direction = 'IN'\n" +
+ " and tstamp between ? and ?\n" +
+ "\n" +
+ "GROUP BY 1,2,3,4,5,6,7\n" +
+ "order by period, ap\n" +
+ ";";
+ }
+
+ /**
+ * Return the correct date_format parameter for the chosen granularity
+ */
+ static String mySqlDateFormat(StatisticsGranularity granularity) {
+ switch (granularity) {
+ case YEAR:
+ return "%Y";
+ case MONTH:
+ return "%Y-%m";
+ case DAY:
+ return "%Y-%m-%d";
+ case HOUR:
+ return "%Y-%m-%dT%h";
+ default:
+ throw new IllegalArgumentException(String.format(
+ "Unable to convert '%s' into a MySQL date_format() string.", granularity));
+ }
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryOracleImpl.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryOracleImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..400d5b6c8c3e861885ae755951cc1ebb26f743dd
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryOracleImpl.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.jdbc;
+
+import network.oxalis.persistence.annotation.Repository;
+import network.oxalis.persistence.api.JdbcTxManager;
+import network.oxalis.statistics.api.RawStatistics;
+import network.oxalis.statistics.api.StatisticsGranularity;
+import network.oxalis.statistics.util.DataSourceHelper;
+
+import javax.inject.Inject;
+import java.sql.*;
+
+/**
+ * This is RawStatisticsRepository implementation for running the statistics database on Oracle backend, through JDBC.
+ *
+ * @author thore
+ */
+@Repository
+public class RawStatisticsRepositoryOracleImpl extends RawStatisticsRepositoryJdbcImpl {
+
+ @Inject
+ public RawStatisticsRepositoryOracleImpl(JdbcTxManager jdbcTxManager) {
+ super(jdbcTxManager);
+ }
+
+ @Override
+ public Integer persist(RawStatistics rawStatistics) {
+ Connection con = null;
+ PreparedStatement ps;
+ Integer result = 0;
+ try {
+ con = jdbcTxManager.getConnection();
+ String sqlStatement = this.getPersistSqlQueryText();
+
+ // Oracle does not support Statement.RETURN_GENERATED_KEYS, so return the trigger generated "id" column
+ ps = con.prepareStatement(sqlStatement, new String[]{"id"});
+ ps.setString(1, rawStatistics.getAccessPointIdentifier().toString());
+ ps.setTimestamp(2, new Timestamp(rawStatistics.getDate().getTime()));
+ ps.setString(3, rawStatistics.getDirection().toString());
+ ps.setString(4, rawStatistics.getSender().getIdentifier());
+ ps.setString(5, rawStatistics.getReceiver().getIdentifier());
+ ps.setString(6, rawStatistics.getDocumentTypeIdentifier().toString());
+ ps.setString(7, rawStatistics.getProcessIdentifier().toString());
+ ps.setString(8, rawStatistics.getChannelId() == null ? null : rawStatistics.getChannelId().stringValue());
+
+ ps.executeUpdate();
+ ResultSet rs = ps.getGeneratedKeys();
+ if (rs.next()) {
+ result = rs.getInt(1);
+ rs.close();
+ }
+ } catch (SQLException e) {
+ throw new IllegalStateException("Unable to execute statement " + e, e);
+ } finally {
+ DataSourceHelper.close(con);
+ }
+ return result;
+ }
+
+ @Override
+ String getPersistSqlQueryText() {
+ return String.format("INSERT INTO %s (ap, tstamp, direction, sender, receiver, doc_type, profile, channel) values (?,?,?,?,?,?,?,?)", RawStatisticsRepositoryJdbcImpl.RAW_STATS_TABLE_NAME);
+ }
+
+ @Override
+ String getRawStatisticsSqlQueryText(StatisticsGranularity granularity) {
+ String dateFormatWithSelectedGranularity = oracleDateFormat(granularity);
+ return "SELECT\n" +
+ " ap,\n" +
+ " 'OUT' direction,\n" +
+ " TO_CHAR(tstamp,'" + dateFormatWithSelectedGranularity + "') period,\n" +
+ " sender ppid,\n" +
+ " doc_type,\n" +
+ " profile,\n" +
+ " channel,\n" +
+ " COUNT(*) count\n" +
+ "FROM\n" +
+ " raw_stats\n" +
+ "WHERE\n" +
+ " direction = 'OUT'\n" +
+ " and tstamp between ? and ?\n" +
+ "GROUP BY 1,2,3,4,5,6,7\n" +
+ "union\n" +
+ "SELECT\n" +
+ " ap,\n" +
+ " 'IN' direction,\n" +
+ " TO_CHAR(tstamp,'" + dateFormatWithSelectedGranularity + "') period,\n" +
+ " receiver ppid,\n" +
+ " doc_type,\n" +
+ " profile,\n" +
+ " channel,\n" +
+ " COUNT(*) count\n" +
+ "FROM\n" +
+ " raw_stats\n" +
+ "WHERE\n" +
+ " direction = 'IN'\n" +
+ " and tstamp between ? and ?\n" +
+ "\n" +
+ "GROUP BY 1,2,3,4,5,6,7\n" +
+ "order by period, ap\n";
+ }
+
+ /**
+ * Return the currect date_format parameter for the chosen granularity
+ */
+ private String oracleDateFormat(StatisticsGranularity granularity) {
+ switch (granularity) {
+ case YEAR:
+ return "YYYY";
+ case MONTH:
+ return "YYYY-MM";
+ case DAY:
+ return "YYYY-MM-DD";
+ case HOUR:
+ return "YYYY-MM-DDT%HH24";
+ default:
+ throw new IllegalArgumentException(String.format(
+ "Unable to convert '%s' into a Oracle date format string.", granularity));
+ }
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/model/AbstractStatistics.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/model/AbstractStatistics.java
new file mode 100644
index 0000000000000000000000000000000000000000..4b7f224d4ee058d336e40437fdcedeb4c670356b
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/model/AbstractStatistics.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.model;
+
+import network.oxalis.api.model.AccessPointIdentifier;
+import network.oxalis.api.model.Direction;
+import network.oxalis.statistics.api.ChannelId;
+import network.oxalis.statistics.api.RawStatistics;
+import network.oxalis.vefa.peppol.common.model.DocumentTypeIdentifier;
+import network.oxalis.vefa.peppol.common.model.ProcessIdentifier;
+
+import java.util.Date;
+
+/**
+ * Basic collection of statistics held for a given transmission
+ *
+ * @author steinar
+ * Date: 25.03.13
+ * Time: 14:09
+ */
+abstract class AbstractStatistics implements RawStatistics {
+
+ AccessPointIdentifier accessPointIdentifier;
+
+ Date date;
+
+ Direction direction;
+
+ DocumentTypeIdentifier peppolDocumentTypeId;
+
+ ChannelId channelId;
+
+ ProcessIdentifier processIdentifier;
+
+ AbstractStatistics(AbstractBuilder abstractBuilder) {
+ this.processIdentifier = abstractBuilder.peppolProcessTypeId;
+ this.peppolDocumentTypeId = abstractBuilder.peppolDocumentTypeId;
+ this.accessPointIdentifier = abstractBuilder.accessPointIdentifier;
+ this.date = abstractBuilder.date;
+ this.direction = abstractBuilder.direction;
+ this.channelId = abstractBuilder.channelId;
+ }
+
+ public Direction getDirection() {
+ return direction;
+ }
+
+ public Date getDate() {
+ return date;
+ }
+
+ public AccessPointIdentifier getAccessPointIdentifier() {
+ return accessPointIdentifier;
+ }
+
+ public DocumentTypeIdentifier getDocumentTypeIdentifier() {
+ return peppolDocumentTypeId;
+ }
+
+ public ChannelId getChannelId() {
+ return channelId;
+ }
+
+ public ProcessIdentifier getProcessIdentifier() {
+ return processIdentifier;
+ }
+
+ protected static abstract class AbstractBuilder {
+
+ AccessPointIdentifier accessPointIdentifier;
+
+ Date date = new Date();
+
+ Direction direction;
+
+ DocumentTypeIdentifier peppolDocumentTypeId;
+
+ ProcessIdentifier peppolProcessTypeId;
+
+ ChannelId channelId;
+
+ public T date(Date dt) {
+ this.date = dt;
+ return getThis();
+ }
+
+ public T accessPointIdentifier(AccessPointIdentifier accessPointIdentifier) {
+ this.accessPointIdentifier = accessPointIdentifier;
+ return getThis();
+ }
+
+
+ public T direction(Direction direction) {
+ this.direction = direction;
+ return getThis();
+ }
+
+ public T outbound() {
+ this.direction = Direction.OUT;
+ return getThis();
+ }
+
+ public T inbound() {
+ this.direction = Direction.IN;
+ return getThis();
+ }
+
+ public T documentType(DocumentTypeIdentifier peppolDocumentTypeId) {
+ this.peppolDocumentTypeId = peppolDocumentTypeId;
+ return getThis();
+ }
+
+ public T profile(ProcessIdentifier processIdentifier) {
+ this.peppolProcessTypeId = processIdentifier;
+ return getThis();
+ }
+
+ public T channel(ChannelId channelId) {
+ this.channelId = channelId;
+ return getThis();
+ }
+
+ protected void checkRequiredFields() {
+
+ if (direction == null) {
+ throw new IllegalStateException("Must specify the direction of the message");
+ }
+
+ if (accessPointIdentifier == null) {
+ throw new IllegalStateException("Identity of access point required");
+ }
+
+ if (peppolDocumentTypeId == null) {
+ throw new IllegalStateException("Document type required");
+ }
+ if (peppolProcessTypeId == null) {
+ throw new IllegalStateException("Process id/profile id required");
+ }
+
+ if (date == null) {
+ throw new IllegalStateException("Date (period) required");
+ }
+ }
+
+ public abstract B build();
+
+ protected abstract T getThis();
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/model/DefaultRawStatistics.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/model/DefaultRawStatistics.java
new file mode 100644
index 0000000000000000000000000000000000000000..ee2757d17ac364370131d57ea66173374c1098c2
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/model/DefaultRawStatistics.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.model;
+
+import network.oxalis.statistics.api.RawStatistics;
+import network.oxalis.vefa.peppol.common.model.ParticipantIdentifier;
+
+/**
+ * Holds a raw statistics entry, which represents a single receipt or transmit operation.
+ *
+ * User: steinar
+ * Date: 30.01.13
+ * Time: 20:35
+ */
+public class DefaultRawStatistics extends AbstractStatistics implements RawStatistics {
+
+ protected ParticipantIdentifier sender;
+
+ protected ParticipantIdentifier receiver;
+
+ private DefaultRawStatistics(RawStatisticsBuilder builder) {
+ super(builder);
+ this.sender = builder.sender;
+ this.receiver = builder.receiver;
+
+ }
+
+ @Override
+ public ParticipantIdentifier getSender() {
+ return sender;
+ }
+
+ @Override
+ public ParticipantIdentifier getReceiver() {
+ return receiver;
+ }
+
+ public static class RawStatisticsBuilder
+ extends AbstractStatistics.AbstractBuilder {
+
+ ParticipantIdentifier sender;
+
+ ParticipantIdentifier receiver;
+
+ public RawStatisticsBuilder sender(ParticipantIdentifier sender) {
+ this.sender = sender;
+ return getThis();
+ }
+
+ public RawStatisticsBuilder receiver(ParticipantIdentifier receiver) {
+ this.receiver = receiver;
+ return getThis();
+ }
+
+ public DefaultRawStatistics build() {
+
+ checkRequiredFields();
+
+ if (sender == null) {
+ throw new IllegalStateException("Must specify identity of sender");
+ }
+ if (receiver == null) {
+ throw new IllegalStateException("Identity of receiver required");
+ }
+
+ return new DefaultRawStatistics(this);
+ }
+
+ @Override
+ protected RawStatisticsBuilder getThis() {
+ return this;
+ }
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/security/OxalisCipher.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/security/OxalisCipher.java
new file mode 100644
index 0000000000000000000000000000000000000000..9c35b0a5f3697d0b14f858d41983f6cf73efa949
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/security/OxalisCipher.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.security;
+
+import javax.crypto.*;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * Oxalis' cipher implementation. Encapsulates information required for encryption and decryption of data using
+ * a symmetric key.
+ *
+ * @author steinar
+ * Date: 06.05.13
+ * Time: 21:22
+ */
+public class OxalisCipher {
+
+ // Advanced Encryption Standard (AES) with Electronic Cookbook Mode (ECB) block mode and PKCS5 Padding
+ // FIXME: Determine why specifying AES/ECB/PKCS5Padding fails when compiling with maven
+ public static final String SYMMETRIC_KEY_ALGORITHM = "AES";
+
+ /**
+ * Name of our encrypted (wrapped) symmetric key. Typically used in HTTP headers, name and value pairs, etc.
+ */
+ public static final String WRAPPED_SYMMETRIC_KEY_HEADER_NAME = "PEPPOL-wrapped-key";
+
+ private SecretKey secretKey;
+
+ public OxalisCipher() {
+ try {
+ KeyGenerator keyGenerator = KeyGenerator.getInstance(SYMMETRIC_KEY_ALGORITHM);
+ secretKey = keyGenerator.generateKey();
+ } catch (NoSuchAlgorithmException e) {
+ throw new IllegalStateException("Unable to create symmetric key for " + SYMMETRIC_KEY_ALGORITHM + e, e);
+ }
+ }
+
+ public OxalisCipher(SecretKey secretKey) {
+ this.secretKey = secretKey;
+ }
+
+
+ /**
+ * Wraps the supplied OutputStream in a encrypted cipher stream, i.e. every plain text byte written
+ * into the new OutputStream is encrypted using our SecretKey.
+ *
+ * @param outputStream the plaint text output stream to encrypted
+ * @return a new OutputStream which will encrypt every byte written to it.
+ * @see #decryptStream(java.io.InputStream)
+ */
+ public OutputStream encryptStream(OutputStream outputStream) {
+ Cipher cipher = createCipher(Cipher.ENCRYPT_MODE);
+ return new CipherOutputStream(outputStream, cipher);
+ }
+
+ /**
+ * Wraps the supplied InputStream in a decrypted cipher stream, i.e. every encrypted byte read from
+ * the new InputStream reads is decrypted using our SecretKey.
+ *
+ * @param inputStream the encrypted input stream
+ * @return new InputStream which will decrypt every byte read from it.
+ */
+ public InputStream decryptStream(InputStream inputStream) {
+
+ Cipher cipher = createCipher(Cipher.DECRYPT_MODE);
+ return new CipherInputStream(inputStream, cipher);
+ }
+
+
+ Cipher createCipher(int encryptMode) {
+ if (secretKey == null) {
+ throw new IllegalStateException("No symmetric secret key available");
+ }
+
+ Cipher cipher = null;
+ try {
+ cipher = Cipher.getInstance(SYMMETRIC_KEY_ALGORITHM);
+ cipher.init(encryptMode, secretKey);
+ } catch (NoSuchAlgorithmException e) {
+ throw new IllegalStateException("Unable to create cipher for algorithm " + SYMMETRIC_KEY_ALGORITHM, e);
+ } catch (NoSuchPaddingException e) {
+ throw new IllegalStateException("Default padding does not work with algorithm " + SYMMETRIC_KEY_ALGORITHM, e);
+ } catch (InvalidKeyException e) {
+ throw new IllegalStateException("Invalid " + SYMMETRIC_KEY_ALGORITHM + " key");
+ }
+ return cipher;
+ }
+
+
+ public SecretKey getSecretKey() {
+ return secretKey;
+ }
+
+ byte[] encrypt(byte[] bytes) throws BadPaddingException, IllegalBlockSizeException {
+ Cipher cipher = createCipher(Cipher.ENCRYPT_MODE);
+ return cipher.doFinal(bytes);
+ }
+
+ byte[] decrypt(byte[] encryptedBytes) throws BadPaddingException, IllegalBlockSizeException {
+ Cipher cipher = createCipher(Cipher.DECRYPT_MODE);
+ return cipher.doFinal(encryptedBytes);
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/security/OxalisCipherConverter.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/security/OxalisCipherConverter.java
new file mode 100644
index 0000000000000000000000000000000000000000..93942532051c387745dc05c3a7a732984c00137e
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/security/OxalisCipherConverter.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.security;
+
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.binary.Hex;
+
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+
+/**
+ * @author steinar
+ * Date: 14.05.13
+ * Time: 09:57
+ */
+public class OxalisCipherConverter {
+
+ /**
+ * Creates an instance of OxalisCipher:
+ *
+ * - Decodes the supplied hex string representation of a wrapped key into an array of bytes representation
+ * - Creates a cipher, which is initialized with a private key
+ * - Unwraps (decrypts) the secret key represented by an array of bytes into a SecretKey
+ * - Creates an OxalisCipher using the unwrapped SecretKey
+ *
+ */
+ public OxalisCipher createCipherFromWrappedHexKey(String wrappedSymmetricKeyAsHexString, PrivateKey privateKey) {
+
+ // 1) Decodes the hex string representation of a wrapped key
+ byte[] encodedBytes = encodedBytesFromHexString(wrappedSymmetricKeyAsHexString);
+
+ try {
+ // 2) Creates the Cipher using supplied private key
+ Cipher cipher = Cipher.getInstance(StatisticsKeyTool.ASYMMETRIC_KEY_ALGORITHM);
+ cipher.init(Cipher.UNWRAP_MODE, privateKey);
+
+ // 3) Unwraps (decrypts) the secret key using our private key
+ SecretKey secretKey = (SecretKey) cipher.unwrap(encodedBytes, OxalisCipher.SYMMETRIC_KEY_ALGORITHM, Cipher.SECRET_KEY);
+
+ // 4) creates the Oxalis cipher
+ OxalisCipher oxalisCipher = new OxalisCipher(secretKey);
+ return oxalisCipher;
+
+ } catch (NoSuchAlgorithmException e) {
+ throw new UnwrapSymmetricKeyException(wrappedSymmetricKeyAsHexString, e);
+ } catch (NoSuchPaddingException e) {
+ throw new UnwrapSymmetricKeyException(wrappedSymmetricKeyAsHexString, e);
+ } catch (InvalidKeyException e) {
+ throw new UnwrapSymmetricKeyException(wrappedSymmetricKeyAsHexString, e);
+ }
+ }
+
+ /**
+ * Encrypts the secret key (symmetric key) held inside the OxalisCipher instance using the supplied PublicKey, after
+ * which the resulting wrapped secret key is transformed into a hex string suitable for transmission, persistence etc.
+ *
+ * @param publicKey the public asymmetric key to use for encrypting the secret symmetric key
+ * @param oxalisCipher the instance of OxalisCipher in which the secret symmetric key is held.
+ * @return
+ */
+ public String getWrappedSymmetricKeyAsString(PublicKey publicKey, OxalisCipher oxalisCipher) {
+
+ try {
+ Cipher cipher = Cipher.getInstance(StatisticsKeyTool.ASYMMETRIC_KEY_ALGORITHM);
+ cipher.init(Cipher.WRAP_MODE, publicKey);
+ SecretKey secretKey = oxalisCipher.getSecretKey();
+ byte[] encodedBytes = cipher.wrap(secretKey);
+
+ return new String(Hex.encodeHex(encodedBytes));
+
+ } catch (NoSuchAlgorithmException e) {
+ throw new IllegalStateException("Unable to create cipher with algorithm: " + StatisticsKeyTool.ASYMMETRIC_KEY_ALGORITHM, e);
+ } catch (NoSuchPaddingException e) {
+ throw new IllegalStateException("Unable to create cipher with default padding for algorithm " + StatisticsKeyTool.ASYMMETRIC_KEY_ALGORITHM, e);
+ } catch (InvalidKeyException e) {
+ throw new IllegalStateException("The public key is invalid " + e.getMessage(), e);
+ } catch (IllegalBlockSizeException e) {
+ throw new IllegalStateException("Error during encryption of symmetric key: " + e.getMessage(), e);
+ }
+ }
+
+
+ private byte[] encodedBytesFromHexString(String wrappedSymmetricKeyAsHexString) {
+ byte[] encodedBytes;
+
+ try {
+ encodedBytes = Hex.decodeHex(wrappedSymmetricKeyAsHexString.toCharArray());
+ } catch (DecoderException e) {
+ throw new IllegalArgumentException("Unable to decode hex string " + wrappedSymmetricKeyAsHexString + "; " + e.getMessage(), e);
+ }
+ return encodedBytes;
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/security/StatisticsKeyTool.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/security/StatisticsKeyTool.java
new file mode 100644
index 0000000000000000000000000000000000000000..63919ff9ed607d0670dde259f251bfde755c202c
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/security/StatisticsKeyTool.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.security;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.*;
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.PublicKey;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.X509EncodedKeySpec;
+
+/**
+ * Provides various methods for generation, loading and saving private and public keys.
+ *
+ * @author steinar
+ * Date: 01.05.13
+ * Time: 21:17
+ */
+@Slf4j
+public class StatisticsKeyTool {
+
+ public static final String ASYMMETRIC_KEY_ALGORITHM = "RSA";
+
+ public static final String OXALIS_STATISTICS_PUBLIC_KEY = "oxalis-statistics-public.key";
+
+ public static final int MAX_LENGTH_OF_ENCODED_KEY = 4096;
+
+ /**
+ * The Oxalis statistics public key is supplied as part of the distribution (of course).
+ *
+ * @return the statistics public key
+ */
+ public PublicKey loadPublicKeyFromClassPath() {
+ InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(OXALIS_STATISTICS_PUBLIC_KEY);
+ if (inputStream == null) {
+ throw new IllegalStateException("Unable to locate file " + OXALIS_STATISTICS_PUBLIC_KEY);
+ }
+ try {
+ byte[] bytes = loadBytesFrom(inputStream);
+ log.info("Loaded public key with " + bytes.length + " bytes");
+ return publicKeyFromBytes(bytes);
+
+ } catch (InvalidKeySpecException e) {
+ throw new IllegalStateException("Invalid public key encoded in " + OXALIS_STATISTICS_PUBLIC_KEY, e);
+ } finally {
+ try {
+ inputStream.close();
+ } catch (IOException e) {
+ throw new IllegalStateException("Unable to close input stream for " + OXALIS_STATISTICS_PUBLIC_KEY, e);
+ }
+ }
+ }
+
+ /**
+ * Loads the public key used for encrypting statistical data.
+ *
+ * @param file
+ * @return
+ */
+ public PublicKey loadPublicKey(File file) {
+ try {
+ byte[] encodedPublicKey = loadBytesFromFile(file);
+
+ return publicKeyFromBytes(encodedPublicKey);
+
+ } catch (InvalidKeySpecException e) {
+ throw new IllegalStateException("Unable to create key from encoded specification in " + file.getAbsolutePath() + "; " + e.getMessage(), e);
+ }
+
+ }
+
+
+ File getPublicKeyFile() {
+ return new File(getResourceDirectory(), OXALIS_STATISTICS_PUBLIC_KEY);
+ }
+
+
+ /**
+ * Provides the name of the temporary directory into which generated keys will be stored.
+ *
+ * @return
+ */
+ File getResourceDirectory() {
+ String tempDirName = System.getProperty("java.io.tmpdir");
+ return new File(tempDirName);
+ }
+
+
+ private PublicKey publicKeyFromBytes(byte[] encodedPublicKey) throws InvalidKeySpecException {
+ X509EncodedKeySpec x509EncodedKeySpec = new X509EncodedKeySpec(encodedPublicKey);
+
+ KeyFactory keyFactory = createKeyFactory();
+ return keyFactory.generatePublic(x509EncodedKeySpec);
+ }
+
+
+ private byte[] loadBytesFromFile(File file) {
+ FileInputStream fileInputStream = null;
+ try {
+ fileInputStream = new FileInputStream(file);
+
+ return loadBytesFrom(fileInputStream);
+ } catch (FileNotFoundException e) {
+ throw new IllegalStateException("Unable to open file " + file.getAbsolutePath());
+ } finally {
+ if (fileInputStream != null) {
+ try {
+ fileInputStream.close();
+ } catch (IOException e) {
+ throw new IllegalStateException("Unable to close file " + file.getAbsolutePath(), e);
+ }
+ }
+ }
+ }
+
+ private byte[] loadBytesFrom(InputStream inputStream) {
+
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+
+ int nRead;
+ byte[] data = new byte[MAX_LENGTH_OF_ENCODED_KEY];
+
+ try {
+ while ((nRead = inputStream.read(data, 0, data.length)) != -1) {
+ buffer.write(data, 0, nRead);
+ }
+
+ buffer.flush();
+ } catch (IOException e) {
+ log.warn(e.getMessage(), e);
+ }
+ return buffer.toByteArray();
+
+ }
+
+ private KeyFactory createKeyFactory() {
+ try {
+ KeyFactory keyFactory = KeyFactory.getInstance(ASYMMETRIC_KEY_ALGORITHM);
+ return keyFactory;
+ } catch (NoSuchAlgorithmException e) {
+ throw new IllegalStateException("Unable to create key factory with algorithm " + ASYMMETRIC_KEY_ALGORITHM + "; " + e.getMessage(), e);
+ }
+ }
+
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/security/UnwrapSymmetricKeyException.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/security/UnwrapSymmetricKeyException.java
new file mode 100644
index 0000000000000000000000000000000000000000..94504052b15d98fb9c2db3bbd375c4521ad4748c
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/security/UnwrapSymmetricKeyException.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.security;
+
+import java.security.GeneralSecurityException;
+
+/**
+ * @author steinar
+ * Date: 13.05.13
+ * Time: 12:56
+ */
+public class UnwrapSymmetricKeyException extends RuntimeException {
+
+ public UnwrapSymmetricKeyException(String encodedSymmetricKey, GeneralSecurityException cause) {
+ super("Unable to unwrap and decrypt wrapped symmetric key; " + cause.getMessage(), cause);
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/service/DefaultStatisticsService.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/service/DefaultStatisticsService.java
new file mode 100644
index 0000000000000000000000000000000000000000..b7e5e9566c16baa0813d43ff281db6f54a678242
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/service/DefaultStatisticsService.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.service;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import io.opentracing.Span;
+import io.opentracing.Tracer;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.api.inbound.InboundMetadata;
+import network.oxalis.api.model.AccessPointIdentifier;
+import network.oxalis.api.model.Direction;
+import network.oxalis.api.outbound.TransmissionRequest;
+import network.oxalis.api.outbound.TransmissionResponse;
+import network.oxalis.api.statistics.StatisticsService;
+import network.oxalis.api.util.Type;
+import network.oxalis.commons.security.CertificateUtils;
+import network.oxalis.commons.tracing.Traceable;
+import network.oxalis.statistics.api.ChannelId;
+import network.oxalis.statistics.api.RawStatisticsRepository;
+import network.oxalis.statistics.model.DefaultRawStatistics;
+
+@Slf4j
+@Singleton
+@Type("default")
+class DefaultStatisticsService extends Traceable implements StatisticsService {
+
+ private final RawStatisticsRepository rawStatisticsRepository;
+
+ @Inject
+ public DefaultStatisticsService(RawStatisticsRepository rawStatisticsRepository, Tracer tracer) {
+ super(tracer);
+ this.rawStatisticsRepository = rawStatisticsRepository;
+ }
+
+ @Override
+ public void persist(TransmissionRequest transmissionRequest, TransmissionResponse transmissionResponse, Span root) {
+ Span span = tracer.buildSpan("persist statistics").asChildOf(root).start();
+ try {
+ String protocolName = transmissionRequest.getEndpoint().getTransportProfile().getIdentifier();
+ String receivingAccessPointCommonName = transmissionRequest.getEndpoint().getCertificate() != null ? CertificateUtils
+ .extractCommonName(transmissionRequest.getEndpoint().getCertificate()) : "";
+
+ DefaultRawStatistics rawStatistics = new DefaultRawStatistics.RawStatisticsBuilder()
+ .accessPointIdentifier(new AccessPointIdentifier(receivingAccessPointCommonName))
+ .direction(Direction.OUT)
+ .documentType(transmissionResponse.getHeader().getDocumentType())
+ .sender(transmissionResponse.getHeader().getSender())
+ .receiver(transmissionResponse.getHeader().getReceiver())
+ .profile(transmissionResponse.getHeader().getProcess())
+ .channel(new ChannelId(protocolName))
+ .date(transmissionResponse.getTimestamp()) // Time stamp of reception of the receipt
+ .build();
+
+ rawStatisticsRepository.persist(rawStatistics);
+ } catch (Exception ex) {
+ span.setTag("exception", String.valueOf(ex.getMessage()));
+ log.error("Persisting DefaultRawStatistics about outbound transmission failed : {}", ex.getMessage(), ex);
+ } finally {
+ span.finish();
+ }
+ }
+
+ @Override
+ public void persist(InboundMetadata inboundMetadata) {
+ // Persists raw statistics when message was received (ignore if stats couldn't be persisted, just warn)
+ try {
+ String protocolName = inboundMetadata.getProtocol().getIdentifier();
+ String sendingAccessPointCommonName = CertificateUtils.extractCommonName(inboundMetadata.getCertificate());
+
+ DefaultRawStatistics rawStatistics = new DefaultRawStatistics.RawStatisticsBuilder()
+ .accessPointIdentifier(new AccessPointIdentifier(sendingAccessPointCommonName))
+ .direction(Direction.IN)
+ .documentType(inboundMetadata.getHeader().getDocumentType())
+ .sender(inboundMetadata.getHeader().getSender())
+ .receiver(inboundMetadata.getHeader().getReceiver())
+ .profile(inboundMetadata.getHeader().getProcess())
+ .channel(new ChannelId(protocolName))
+ .build();
+
+ rawStatisticsRepository.persist(rawStatistics);
+ } catch (Exception e) {
+ log.error("Unable to persist statistics for " + inboundMetadata.toString() + ";\n " + e.getMessage(), e);
+ }
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/service/StatisticsModule.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/service/StatisticsModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..70d5c7961814551791cc0be3986223844ff7ab0d
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/service/StatisticsModule.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.service;
+
+import network.oxalis.api.statistics.StatisticsService;
+import network.oxalis.commons.guice.OxalisModule;
+
+public class StatisticsModule extends OxalisModule {
+
+ @Override
+ protected void configure() {
+ bindTyped(StatisticsService.class, DefaultStatisticsService.class);
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/util/DataSourceHelper.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/util/DataSourceHelper.java
new file mode 100644
index 0000000000000000000000000000000000000000..51745135d27beb4caef9278fd8a2848f9fbc3f40
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/util/DataSourceHelper.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.util;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+/**
+ * @author steinar
+ * Date: 15.08.13
+ * Time: 15:50
+ */
+public class DataSourceHelper {
+
+ public static void close(Connection con) {
+ if (con != null) {
+ try {
+ con.close();
+ } catch (SQLException e) {
+ throw new IllegalStateException("Unable to close JDBC connection " + con);
+ }
+ }
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/util/JdbcHelper.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/util/JdbcHelper.java
new file mode 100644
index 0000000000000000000000000000000000000000..fcf9bb06642c688d91421aa6e47521dbdca8b680
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/util/JdbcHelper.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.util;
+
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * @author steinar
+ * Date: 15.08.13
+ * Time: 16:13
+ */
+public class JdbcHelper {
+
+ public static Date setEndDateIfNull(Date end) {
+ if (end == null) {
+ end = new Date();
+ }
+ return end;
+ }
+
+ public static Date setStartDateIfNull(Date start) {
+ Date result = start;
+ if (start == null) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(2013, Calendar.FEBRUARY, 1);
+ result = calendar.getTime();
+ }
+
+ return result;
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/util/StatisticsToXmlTransformer.java b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/util/StatisticsToXmlTransformer.java
new file mode 100644
index 0000000000000000000000000000000000000000..0ba96c920624a05cf51da9e3bd53794fa50ff49b
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/java/network/oxalis/statistics/util/StatisticsToXmlTransformer.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.util;
+
+
+import network.oxalis.statistics.api.StatisticsTransformer;
+
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+import java.io.OutputStream;
+import java.util.Date;
+
+/**
+ * User: steinar
+ * Date: 24.02.13
+ * Time: 10:36
+ */
+public class StatisticsToXmlTransformer implements StatisticsTransformer {
+
+ private final OutputStream outputStream;
+
+ private XMLStreamWriter xmlStreamWriter;
+
+ public StatisticsToXmlTransformer(OutputStream outputStream) {
+
+ if (outputStream == null) {
+ throw new IllegalArgumentException("Required argument outputStream is null");
+ }
+ this.outputStream = outputStream;
+ }
+
+ @Override
+ public void startStatistics(Date start, Date end) {
+ XMLOutputFactory xmlOutputFactory = XMLOutputFactory.newInstance();
+
+ try {
+ xmlStreamWriter = xmlOutputFactory.createXMLStreamWriter(outputStream, "UTF-8");
+ xmlStreamWriter.writeStartDocument("UTF-8", "1.0");
+ // TODO: consider the use of a name space?
+ xmlStreamWriter.writeStartElement(STATISTICS_DOCUMENT_START_ELEMENT_NAME);
+
+ String startString = String.format("%tF %tR", start, start);
+ xmlStreamWriter.writeAttribute("start", startString);
+
+ String endString = String.format("%tF %tR", end, end);
+ xmlStreamWriter.writeAttribute("end", endString);
+
+ } catch (XMLStreamException e) {
+ throw new IllegalStateException("Unable to create XML stream writer; " + e.getMessage(), e);
+ }
+ }
+
+ @Override
+ public void startEntry() {
+
+ try {
+ xmlStreamWriter.writeStartElement(ENTRY_START_ELEMENT_NAME);
+ } catch (XMLStreamException e) {
+ throw new IllegalStateException("Unable to write element " + STATISTICS_DOCUMENT_START_ELEMENT_NAME + "; " + e, e);
+ }
+ }
+
+ @Override
+ public void writeAccessPointIdentifier(String accessPointIdentifier) {
+ writeElementAndContents(ACCESS_POINT_ID_ELEMENT_NAME, accessPointIdentifier);
+ }
+
+ @Override
+ public void writePeriod(String period) {
+ writeElementAndContents(PERIOD_ELEMENT_NAME, period);
+ }
+
+ @Override
+ public void writeDirection(String direction) {
+ writeElementAndContents(DIRECTION_ELEMENT_NAME, direction);
+ }
+
+ private void writeElementAndContents(String elementName, String contents) {
+ try {
+ xmlStreamWriter.writeStartElement(elementName);
+ if (contents != null) {
+ xmlStreamWriter.writeCharacters(contents);
+ }
+ xmlStreamWriter.writeEndElement();
+ } catch (XMLStreamException e) {
+ throw new IllegalStateException("Unable to write " + elementName + " element with value of " + contents + "; " + e, e);
+ }
+ }
+
+ @Override
+ public void writeParticipantIdentifier(String participantId) {
+ writeElementAndContents(PARTICIPANT_ID_ELEMENT_NAME, participantId);
+ }
+
+ @Override
+ public void writeDocumentType(String documentType) {
+ writeElementAndContents(DOCUMENT_TYPE_ELEMENT_NAME, documentType);
+ }
+
+ @Override
+ public void writeProfileId(String profileId) {
+ writeElementAndContents(PROFILE_ID_ELEMENT_NAME, profileId);
+ }
+
+ @Override
+ public void writeChannel(String channel) {
+ writeElementAndContents(CHANNEL_ELEMENT_NAME, channel);
+ }
+
+ @Override
+ public void writeCount(int count) {
+ writeElementAndContents(COUNT_ELEMENT_NAME, "" + count);
+ }
+
+ @Override
+ public void endEntry() {
+ try {
+ xmlStreamWriter.writeEndElement();
+ } catch (XMLStreamException e) {
+ throw new IllegalStateException("Unable to write statistics end element " + e, e);
+ }
+
+ }
+
+ @Override
+ public void endStatistics() {
+
+ try {
+ xmlStreamWriter.writeEndDocument();
+ xmlStreamWriter.flush();
+ } catch (XMLStreamException e) {
+ throw new IllegalStateException("Unable to write end of statistics document; " + e.getMessage(), e);
+ }
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/main/resources/oxalis-statistics-public.key b/oxalis-legacy/oxalis-statistics/src/main/resources/oxalis-statistics-public.key
new file mode 100644
index 0000000000000000000000000000000000000000..0aa7b87be1329e4896feef72b480d53f98917e5a
Binary files /dev/null and b/oxalis-legacy/oxalis-statistics/src/main/resources/oxalis-statistics-public.key differ
diff --git a/oxalis-legacy/oxalis-statistics/src/main/resources/reference.conf b/oxalis-legacy/oxalis-statistics/src/main/resources/reference.conf
new file mode 100644
index 0000000000000000000000000000000000000000..9da0b39be064b7331cffa29f271e653011b0aa88
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/resources/reference.conf
@@ -0,0 +1,8 @@
+oxalis.module.statistics.repository.class = network.oxalis.statistics.guice.RawStatisticsRepositoryModule
+
+oxalis.module.statistics.inbound = {
+ class = network.oxalis.statistics.inbound.StatisticsInboundModule
+ dependency = inbound.servlet
+}
+
+oxalis.module.statistics.default.class = network.oxalis.statistics.service.StatisticsModule
\ No newline at end of file
diff --git a/oxalis-legacy/oxalis-statistics/src/main/resources/sql/raw_stats-h2.sql b/oxalis-legacy/oxalis-statistics/src/main/resources/sql/raw_stats-h2.sql
new file mode 100644
index 0000000000000000000000000000000000000000..ca0e1d3a5d42108ecb86f0ba7392bfdc92eb1277
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/resources/sql/raw_stats-h2.sql
@@ -0,0 +1,21 @@
+
+drop table if exists raw_stats;
+
+
+/**
+ * Creates the table to hold the raw statistics, which everybody needs.
+ */
+create table if not exists raw_stats(
+ id integer auto_increment primary key,
+ ap varchar(35) not null,
+ tstamp timestamp not null default current_timestamp,
+ direction varchar(8),
+ sender varchar(35) not null,
+ receiver varchar(35) not null,
+ doc_type varchar(255) not null,
+ profile varchar(255) ,
+ channel varchar(255),
+ CONSTRAINT unique_direction_stats check(direction in ('IN','OUT'))
+
+);
+
diff --git a/oxalis-legacy/oxalis-statistics/src/main/resources/sql/raw_stats-hsqldb.sql b/oxalis-legacy/oxalis-statistics/src/main/resources/sql/raw_stats-hsqldb.sql
new file mode 100644
index 0000000000000000000000000000000000000000..ca78d373a1797a359190994f3ed02dd884b12278
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/resources/sql/raw_stats-hsqldb.sql
@@ -0,0 +1,13 @@
+create table if not exists raw_stats(
+ id integer generated by default as identity (start with 1) primary key,
+ ap varchar(35) not null,
+ tstamp timestamp with time zone default current_timestamp,
+ direction varchar(8) not null,
+ sender varchar(35) not null,
+ receiver varchar(35) not null,
+ doc_type varchar(255) not null,
+ profile varchar(255) ,
+ channel varchar(255)
+);
+
+grant all on raw_stats to skrue;
\ No newline at end of file
diff --git a/oxalis-legacy/oxalis-statistics/src/main/resources/sql/raw_stats-mssql.sql b/oxalis-legacy/oxalis-statistics/src/main/resources/sql/raw_stats-mssql.sql
new file mode 100644
index 0000000000000000000000000000000000000000..fb9fe7acfd6a180839f5d076da0dc259a5e3bab7
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/resources/sql/raw_stats-mssql.sql
@@ -0,0 +1,16 @@
+/**
+ * MICROSOFT SQL SERVER ADAPTED SQL (raw_stats-mssql.sql)
+ */
+create table raw_stats(
+ id integer identity(1,1) primary key,
+ ap varchar(35) not null,
+ tstamp datetime not null default current_timestamp,
+ direction varchar(8),
+ sender varchar(35) not null,
+ receiver varchar(35) not null,
+ doc_type varchar(255) not null,
+ profile varchar(255) ,
+ channel varchar(255),
+ CONSTRAINT unique_direction_stats check(direction in ('IN','OUT')),
+
+);
diff --git a/oxalis-legacy/oxalis-statistics/src/main/resources/sql/raw_stats-mysql.sql b/oxalis-legacy/oxalis-statistics/src/main/resources/sql/raw_stats-mysql.sql
new file mode 100644
index 0000000000000000000000000000000000000000..81cc136b383d87d3222e767b5d1ff346e4a71000
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/resources/sql/raw_stats-mysql.sql
@@ -0,0 +1,14 @@
+/**
+ * Creates the table to hold the raw statistics, which everybody needs.
+ */
+create table if not exists raw_stats(
+ id integer auto_increment primary key,
+ ap varchar(35) not null,
+ tstamp timestamp default current_timestamp,
+ direction enum('IN','OUT'),
+ sender varchar(35) not null,
+ receiver varchar(35) not null,
+ doc_type varchar(255) not null,
+ profile varchar(255) ,
+ channel varchar(255)
+);
diff --git a/oxalis-legacy/oxalis-statistics/src/main/resources/sql/raw_stats-oracle.sql b/oxalis-legacy/oxalis-statistics/src/main/resources/sql/raw_stats-oracle.sql
new file mode 100644
index 0000000000000000000000000000000000000000..9dfbba5625daefccd1e38a11516518653ac1de64
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/main/resources/sql/raw_stats-oracle.sql
@@ -0,0 +1,44 @@
+-- ==========================================
+-- ORACLE ADAPTED SQL (raw_stats-oracle.sql)
+-- ==========================================
+
+-- drop trigger raw_stats_trg;
+-- drop table /* if exists */ raw_stats;
+-- drop sequence raw_stats_seq;
+
+create sequence raw_stats_seq start with 1 increment by 1 nocache;
+
+create table raw_stats (
+ id integer /* auto_increment */ primary key,
+ ap varchar(35) not null,
+ tstamp timestamp default current_timestamp,
+ direction /* enum */ VARCHAR2(8) CHECK( direction IN ('IN','OUT') ),
+ sender varchar(35) not null,
+ receiver varchar(35) not null,
+ doc_type varchar(255) not null,
+ profile varchar(255),
+ channel varchar(255)
+);
+
+CREATE OR REPLACE TRIGGER raw_stats_trg
+ BEFORE INSERT ON raw_stats FOR EACH ROW
+BEGIN
+ IF :NEW.id IS NULL THEN
+ SELECT raw_stats_seq.NEXTVAL INTO :NEW.id FROM DUAL;
+ END IF;
+END;
+
+-- desc raw_stats;
+-- insert into raw_stats (ap, direction, sender, receiver, doc_type) values ('ap', 'OUT', 'sender', 'receiver', 'invoice');
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/inbound/StatisticsServletTest.java b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/inbound/StatisticsServletTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..66145c88da8a85065adf637228c6dc7c50c5e84f
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/inbound/StatisticsServletTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.inbound;
+
+import com.google.inject.Injector;
+import network.oxalis.inbound.OxalisGuiceContextListener;
+import network.oxalis.test.jetty.AbstractJettyServerTest;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import javax.servlet.http.HttpServletResponse;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+@Test
+public class StatisticsServletTest extends AbstractJettyServerTest {
+
+ @Override
+ public Injector getInjector() {
+ return new OxalisGuiceContextListener().getInjector();
+ }
+
+ @Test
+ public void emptyGet() throws Exception {
+ HttpURLConnection httpURLConnection =
+ (HttpURLConnection) new URL("http://localhost:8080/statistics/").openConnection();
+
+ Assert.assertEquals(httpURLConnection.getResponseCode(), HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ }
+
+ @Test
+ public void post() throws Exception {
+ HttpURLConnection httpURLConnection =
+ (HttpURLConnection) new URL("http://localhost:8080/statistics/").openConnection();
+ httpURLConnection.setRequestMethod("POST");
+
+ Assert.assertEquals(httpURLConnection.getResponseCode(), HttpServletResponse.SC_OK);
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryModuleTest.java b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryModuleTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..6dd8a58085a311682a5eb24d7f9e7cc8279627fb
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryModuleTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.jdbc;
+
+import com.google.inject.CreationException;
+import com.google.inject.Guice;
+import network.oxalis.statistics.guice.RawStatisticsRepositoryModule;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.fail;
+
+/**
+ * @author steinar
+ * Date: 28.10.2016
+ * Time: 08.38
+ */
+public class RawStatisticsRepositoryModuleTest {
+
+ @Test
+ public void testConfigure() throws Exception {
+
+ try {
+ Guice.createInjector(new RawStatisticsRepositoryModule());
+ fail("Should not be able to create injector with supplying a module providing \n" +
+ "an instance of DataSource and Settings");
+ } catch (CreationException e) {
+ // As expected
+ }
+ }
+
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryMySqlMockTest.java b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryMySqlMockTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..4f2afd29cdb947ba391f4f3002c610e1edb77fed
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryMySqlMockTest.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.jdbc;
+
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+import network.oxalis.statistics.api.ChannelId;
+import network.oxalis.statistics.api.RawStatisticsRepository;
+import network.oxalis.statistics.api.StatisticsGranularity;
+import network.oxalis.statistics.guice.RawStatisticsRepositoryModule;
+import network.oxalis.statistics.model.DefaultRawStatistics;
+import network.oxalis.test.identifier.PeppolDocumentTypeIdAcronym;
+import network.oxalis.test.identifier.PeppolProcessTypeIdAcronym;
+import network.oxalis.api.model.AccessPointIdentifier;
+import network.oxalis.persistence.annotation.Transactional;
+import network.oxalis.persistence.platform.MySQLPlatform;
+import network.oxalis.persistence.platform.PlatformModule;
+import network.oxalis.persistence.testng.PersistenceModuleFactory;
+import network.oxalis.vefa.peppol.common.model.ParticipantIdentifier;
+import org.h2.tools.RunScript;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import javax.sql.DataSource;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+/**
+ * Tests the MySQL implementation
+ *
+ * @author steinar
+ * Date: 26.03.13
+ * Time: 10:38
+ * @author erlend
+ */
+@Guice(moduleFactory = PersistenceModuleFactory.class,
+ modules = {RawStatisticsRepositoryModule.class, PlatformModule.class})
+public class RawStatisticsRepositoryMySqlMockTest {
+
+ @Inject
+ @Named(MySQLPlatform.IDENTIFIER)
+ private RawStatisticsRepository repository;
+
+ @Inject
+ private DataSource dataSource;
+
+ @BeforeClass
+ @Transactional
+ public void beforeClass() throws Exception {
+ RunScript.execute(dataSource.getConnection(), new InputStreamReader(
+ getClass().getResourceAsStream(PersistenceModuleFactory.CREATE_OXALIS_DBMS_H2_SQL),
+ StandardCharsets.UTF_8));
+ }
+
+ @Test
+ public void testPersist() throws Exception {
+
+ assertTrue(repository instanceof RawStatisticsRepositoryMySqlImpl);
+
+ DefaultRawStatistics rawStatistics = new DefaultRawStatistics.RawStatisticsBuilder()
+ .accessPointIdentifier(new AccessPointIdentifier("AP_SendRegning"))
+ .outbound()
+ .sender(ParticipantIdentifier.of("9908:810017902"))
+ .receiver(ParticipantIdentifier.of("9908:810017902"))
+ .channel(new ChannelId("CH01"))
+ .documentType(PeppolDocumentTypeIdAcronym.INVOICE.toVefa())
+ .profile(PeppolProcessTypeIdAcronym.INVOICE_ONLY.toVefa())
+ .build();
+ repository.persist(rawStatistics);
+ }
+
+ @Test
+ public void testMySqlDateFormatYear() throws Exception {
+ String s = RawStatisticsRepositoryMySqlImpl.mySqlDateFormat(StatisticsGranularity.YEAR);
+ assertEquals(s, "%Y");
+ }
+
+ @Test
+ public void testMySqlDateFormatMonth() throws Exception {
+ String s = RawStatisticsRepositoryMySqlImpl.mySqlDateFormat(StatisticsGranularity.MONTH);
+ assertEquals(s, "%Y-%m");
+ }
+
+ @Test
+ public void testMySqlDateFormatDay() throws Exception {
+ String s = RawStatisticsRepositoryMySqlImpl.mySqlDateFormat(StatisticsGranularity.DAY);
+ assertEquals(s, "%Y-%m-%d");
+ }
+
+ @Test
+ public void testMySqlDateFormatHour() throws Exception {
+ String s = RawStatisticsRepositoryMySqlImpl.mySqlDateFormat(StatisticsGranularity.HOUR);
+ assertEquals(s, "%Y-%m-%dT%h");
+ }
+
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryTest.java b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..a8de2657afad79aecfeeaf60992f4d4410dc26e0
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/jdbc/RawStatisticsRepositoryTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.jdbc;
+
+import network.oxalis.persistence.platform.PlatformModule;
+import network.oxalis.persistence.testng.PersistenceModuleFactory;
+import network.oxalis.statistics.api.RawStatisticsRepository;
+import network.oxalis.statistics.guice.RawStatisticsRepositoryModule;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import javax.inject.Inject;
+
+import static org.testng.Assert.assertNotNull;
+
+/**
+ * @author steinar
+ * Date: 28.10.2016
+ * Time: 17.23
+ */
+@Guice(moduleFactory = PersistenceModuleFactory.class,
+ modules = {RawStatisticsRepositoryModule.class, PlatformModule.class})
+public class RawStatisticsRepositoryTest {
+
+ @Inject
+ private RawStatisticsRepository rawStatisticsRepository;
+
+ @Test
+ public void testInjection() {
+ assertNotNull(rawStatisticsRepository);
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/EncryptionTest.java b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/EncryptionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..34a965fb914c244011470b4eede3b93345e61f7d
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/EncryptionTest.java
@@ -0,0 +1,252 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.security;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import javax.crypto.*;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.PBEParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.*;
+import java.nio.charset.Charset;
+import java.security.*;
+
+import static org.testng.Assert.assertEquals;
+
+/**
+ * @author steinar
+ * Date: 29.04.13
+ * Time: 09:51
+ */
+public class EncryptionTest {
+
+ private KeyPair keyPair;
+
+ private SecretKey secretKey;
+
+ @BeforeClass
+ public void createKeyPair() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException {
+ KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
+ keyPairGenerator.initialize(1024); // Medium security is fine
+ keyPair = keyPairGenerator.generateKeyPair();
+
+ KeyGenerator keyGenerator = KeyGenerator.getInstance("DES");
+ keyGenerator.init(new SecureRandom());
+ secretKey = keyGenerator.generateKey();
+ }
+
+
+ @Test()
+ public void encryptData() throws Exception {
+
+ String plainText = "Hello world";
+ byte[] encryptedBytes = encrypt(keyPair, plainText);
+
+ String decryptedPlainText = decrypt(keyPair, encryptedBytes);
+
+ assertEquals(decryptedPlainText, plainText);
+
+ }
+
+
+ @Test
+ public void encryptAndDecryptFile() throws Exception {
+
+ File file = File.createTempFile("oxalis", ".data");
+
+ // Writes encrypted data into file
+ Cipher encryptionCipher = Cipher.getInstance("DES/CFB8/NoPadding");
+ encryptionCipher.init(Cipher.ENCRYPT_MODE, secretKey);
+
+
+ CipherOutputStream cipherOutputStream = new CipherOutputStream(new FileOutputStream(file), encryptionCipher);
+ OutputStreamWriter outputStreamWriter = new OutputStreamWriter(cipherOutputStream, Charset.forName("UTF-8"));
+
+ String plainText = "Hello world";
+ outputStreamWriter.write(plainText);
+ outputStreamWriter.close();
+
+
+ // Reads and decrypts data from a file
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+
+ Cipher cipher = Cipher.getInstance("DES/CFB8/NoPadding");
+ AlgorithmParameters parameters = encryptionCipher.getParameters();
+ System.err.println(parameters.toString());
+ cipher.init(Cipher.DECRYPT_MODE, secretKey, parameters);
+
+ Cipher symmetricCipher = cipher;
+ CipherInputStream cipherInputStream = new CipherInputStream(new FileInputStream(file), symmetricCipher);
+ BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(cipherInputStream, Charset.forName("UTF-8")));
+
+ String decryptedText = bufferedReader.readLine();
+ assertEquals(decryptedText, plainText);
+
+ file.delete();
+ }
+
+
+ /**
+ * Experimental test method. Does not test any part of the system
+ *
+ * @throws Exception
+ */
+ @Test
+ public void encryptDataWithWrappedKey() throws Exception {
+
+ // Creates the shared key to be used for encrypting the data
+ KeyGenerator keyGenerator = KeyGenerator.getInstance("AES");
+ Key sharedKey = keyGenerator.generateKey();
+
+ // Wraps the shared key within an asymmetric key
+ String password = "The quick brown fox jumped over the lazy dog";
+
+ byte[] salt = {0x01, 0x02, 0x03, 0x04, 0x05, 0x07, 0x06, 0x08};
+
+ PBEParameterSpec pbeParameterSpec = new PBEParameterSpec(salt, 20);
+ PBEKeySpec pbeKeySpec = new PBEKeySpec(password.toCharArray());
+
+ SecretKeyFactory kf = SecretKeyFactory.getInstance("PBEWithMD5AndDES");
+ SecretKey passwordKey = kf.generateSecret(pbeKeySpec);
+
+ Cipher cipher = Cipher.getInstance("PBEWithMD5AndDES");
+ cipher.init(Cipher.WRAP_MODE, passwordKey, pbeParameterSpec);
+ byte[] wrappedSharedKey = cipher.wrap(sharedKey);
+
+
+ // Encrypt some data with shared key
+ cipher = Cipher.getInstance("AES");
+ cipher.init(Cipher.ENCRYPT_MODE, sharedKey);
+
+ String plainText = "Hello world";
+ byte[] input = plainText.getBytes();
+ byte[] encrypted = cipher.doFinal(input);
+
+ // Read the wrapped key and the encrypted data
+
+ // First; unwrap the key
+ cipher = Cipher.getInstance("PBEWithMD5AndDES");
+ // TODO: pass the parameters of the wrappedSharedKey
+ cipher.init(Cipher.UNWRAP_MODE, passwordKey, pbeParameterSpec);
+
+ Key unwrappedKey = cipher.unwrap(wrappedSharedKey, "AES", Cipher.SECRET_KEY);
+
+ // Decrypt the data
+ cipher = Cipher.getInstance("AES");
+ cipher.init(Cipher.DECRYPT_MODE, unwrappedKey);
+
+ String newData = new String(cipher.doFinal(encrypted));
+
+ assertEquals(newData, plainText);
+ }
+
+
+ @Test
+ public void createAsymmetricKeyPair() throws Exception {
+ KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
+ KeyPair pair = keyPairGenerator.generateKeyPair();
+ PublicKey publicKey = pair.getPublic();
+ System.err.println("Algorithm:" + publicKey.getAlgorithm());
+ System.err.println("Format" + publicKey.getFormat());
+
+ byte[] encoded = publicKey.getEncoded();
+ for (int i = 0; i < encoded.length; i++) {
+ byte b = encoded[i];
+ }
+ }
+
+ /**
+ * Encrypts something with AES, transforms the key into a key specification, recreates the key and decrypts
+ * the encrypted contents.
+ *
+ * @throws NoSuchAlgorithmException
+ * @throws NoSuchPaddingException
+ * @throws InvalidKeyException
+ * @throws UnsupportedEncodingException
+ * @throws BadPaddingException
+ * @throws IllegalBlockSizeException
+ */
+ @Test
+ public void encryptAndDecryptWithSymmetricKey() throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException, UnsupportedEncodingException, BadPaddingException, IllegalBlockSizeException {
+ KeyGenerator keyGenerator = KeyGenerator.getInstance("AES");
+ SecretKey key = keyGenerator.generateKey();
+ System.err.println("Algorithm:" + key.getAlgorithm());
+ System.err.println("Format:" + key.getFormat());
+
+ // Transforms the secret key (symmetric) into a secret key specification
+ SecretKeySpec secretKeySpec = new SecretKeySpec(key.getEncoded(), "AES");
+
+ Cipher encryptionCipher = Cipher.getInstance("AES");
+ encryptionCipher.init(Cipher.ENCRYPT_MODE, key);
+
+ String plainText = "Hello world";
+
+ byte[] encryptedBytes = encryptionCipher.doFinal(plainText.getBytes("UTF-8"));
+
+ Cipher decryptionCipher = Cipher.getInstance("AES");
+ decryptionCipher.init(Cipher.DECRYPT_MODE, secretKeySpec);
+
+ byte[] decryptedBytes = decryptionCipher.doFinal(encryptedBytes);
+
+ String decryptedText = new String(decryptedBytes, Charset.forName("UTF-8"));
+
+ assertEquals(decryptedText, plainText);
+ }
+
+
+ @Test
+ public void holdEncryptedBytes() throws Exception {
+ KeyGenerator keyGenerator = KeyGenerator.getInstance("AES");
+ SecretKey key = keyGenerator.generateKey();
+ }
+
+ private Cipher getSymmetricCipher(int mode) throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException {
+ Cipher cipher = Cipher.getInstance("DES/CFB8/NoPadding");
+ cipher.init(mode, secretKey);
+
+ return cipher;
+ }
+
+ private String decrypt(KeyPair keyPair, byte[] encryptedBytes) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, BadPaddingException, IllegalBlockSizeException {
+ Cipher cipher = getCipher();
+ cipher.init(Cipher.DECRYPT_MODE, keyPair.getPrivate());
+
+ byte[] bytes = cipher.doFinal(encryptedBytes);
+
+ return new String(bytes, Charset.forName("UTF-8"));
+ }
+
+ private Cipher getCipher() throws NoSuchAlgorithmException, NoSuchPaddingException {
+ return Cipher.getInstance("RSA");
+ }
+
+ private byte[] encrypt(KeyPair keyPair, String plainText) throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException {
+ Cipher cipher = getCipher();
+ cipher.init(Cipher.ENCRYPT_MODE, keyPair.getPublic());
+ byte[] bytes = cipher.doFinal(plainText.getBytes());
+
+ return bytes;
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/OxalisCipherTest.java b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/OxalisCipherTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..3dbb05040ca26f76465c6a803daa2b69c3587fd3
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/OxalisCipherTest.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.security;
+
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.SecretKey;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.PublicKey;
+import java.util.Arrays;
+
+import static org.testng.Assert.*;
+
+/**
+ * @author steinar
+ * Date: 06.05.13
+ * Time: 22:34
+ */
+public class OxalisCipherTest {
+
+ private StatisticsKeyTool statisticsKeyTool;
+
+ private OxalisCipher oxalisCipher;
+
+ private OxalisCipherConverter oxalisCipherConverter;
+
+ @BeforeMethod
+ public void setUp() throws IOException {
+ oxalisCipher = new OxalisCipher();
+ oxalisCipherConverter = new OxalisCipherConverter();
+
+ Path tempDirectory = Files.createTempDirectory("unit-test");
+
+ statisticsKeyTool = new StatisticsKeyTool();
+ assertNotNull(statisticsKeyTool);
+ }
+
+
+ /**
+ * Verifies understanding of converting a string between bytes and a string
+ */
+ @Test
+ public void convertBetweenCharAndBytes() throws Exception {
+
+ String s = "Hello World!" + "\u00e6" + "\u00f8" + "\u00e5" + "\u00c6" + "\u00d8" + "\u00c5";
+
+ byte[] bytes = s.getBytes("UTF-8");
+
+ String s1 = new String(bytes, "UTF-8");
+ assertEquals(s, s1);
+ }
+
+
+ @Test
+ public void encryptAndDecryptAString() throws Exception {
+ String s = "Hello World! " + "\u00e6" + "\u00f8" + "\u00e5" + "\u00c6" + "\u00d8" + "\u00c5";
+
+ // Encrypt, decrypt and compare using the simple methods
+ byte[] encryptedBytes = oxalisCipher.encrypt(s.getBytes("UTF-8"));
+ byte[] decryptedBytes = oxalisCipher.decrypt(encryptedBytes);
+
+ // array of bytes should be equal
+ assertTrue(Arrays.equals(s.getBytes("UTF-8"), decryptedBytes));
+
+ // Converting back to a string should still equal our initial string
+ String s2 = new String(decryptedBytes, "UTF-8");
+ assertEquals(s, s2, "Oops decrypted string does not compare to encrypted string. Perhaps an encoding problem?");
+ }
+
+ @Test
+ public void encryptAndDecryptSomeXml() throws Exception {
+ String s = "\n" +
+ "";
+
+ // Encrypt, decrypt and compare using the simple methods
+ byte[] encryptedBytes = oxalisCipher.encrypt(s.getBytes("UTF-8"));
+ byte[] decryptedBytes = oxalisCipher.decrypt(encryptedBytes);
+
+ // array of bytes should be equal
+ assertTrue(Arrays.equals(s.getBytes("UTF-8"), decryptedBytes));
+
+ // Converting back to a string should still equal our initial string
+ String s2 = new String(decryptedBytes, "UTF-8");
+ assertEquals(s, s2);
+ }
+
+
+ /**
+ * Mimics how a servlet will respond with an encrypted entity for which the key is encrypted and placed
+ * in a header.
+ */
+ @Test
+ public void testEncryptAndDecrypt() throws IOException, BadPaddingException, IllegalBlockSizeException {
+
+ String plainText = "Hello World! " + "\u00e6" + "\u00f8" + "\u00e5";
+
+ byte[] encryptedBytes = encryptString(plainText, Charset.forName("ISO-8859-1"));
+
+ String s = decryptToString(oxalisCipher, encryptedBytes, Charset.forName("ISO-8859-1"));
+
+ assertEquals(s, plainText);
+ }
+
+ /**
+ * Decrypts bytes using the symmetric key held in the OxalisCipher instance.
+ * Uses Cipher streams.
+ *
+ * @param cipher
+ * @param encryptedBytes
+ * @param charset the character set encoding to use
+ * @return
+ * @throws IOException
+ */
+ private String decryptToString(OxalisCipher cipher, byte[] encryptedBytes, Charset charset)
+ throws IOException, BadPaddingException, IllegalBlockSizeException {
+
+ byte[] decryptedBytes = oxalisCipher.decrypt(encryptedBytes);
+
+ return new String(decryptedBytes, charset);
+ }
+
+ /**
+ * Encrypts bytes using the symmetric key held in the OxalisCipher instance.
+ */
+ private byte[] encryptString(String plainText, Charset charset)
+ throws IOException, BadPaddingException, IllegalBlockSizeException {
+ return oxalisCipher.encrypt(plainText.getBytes(charset));
+ }
+
+
+ /**
+ * Encrypts data using our symmetric secret key obtained from the instance of OxalisCipher, after which
+ * the secret key is encrypted (wrapped) using the public asymmetric RSA keys loaded from disk.
+ * Finally the secret key is decrypted (unwrapped) and the encrypted data is decrypted.
+ *
+ * NOTE! If this goes belly up, you should verify that the public and private key loaded by
+ * StatisticsKeyTool is actually a pair.
+ *
+ * @param publicKey
+ * @throws Exception
+ */
+ @Test(dataProvider = "publicKey")
+ public void encryptDataEncryptKeyAndReverse(PublicKey publicKey) throws Exception {
+
+ String plainText = "Sample data for testing purposes æøå";
+ byte[] encryptedBytes = encryptString(plainText, Charset.forName("UTF-8"));
+
+ String encodedSymmetricKey = oxalisCipherConverter.getWrappedSymmetricKeyAsString(publicKey, oxalisCipher);
+ assertNotNull(encodedSymmetricKey);
+ }
+
+ /**
+ * Proves that a symmetric AES key, which we obtain from the OxalisCipher instance,
+ * can be wrapped and unwrapped using an asymmetric RSA key.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testWrapKey() throws Exception {
+ // Generates our asymmetric key pair
+ KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
+ KeyPair keyPair = keyPairGenerator.generateKeyPair();
+
+ // Wraps the symmetric secret key
+ Cipher cipher = Cipher.getInstance("RSA");
+ cipher.init(Cipher.WRAP_MODE, keyPair.getPublic());
+ byte[] wrappedSecretKey = cipher.wrap(oxalisCipher.getSecretKey());
+
+
+ // Unwraps the symmetric secret key
+ Cipher cipher1 = Cipher.getInstance("RSA");
+ cipher1.init(Cipher.UNWRAP_MODE, keyPair.getPrivate());
+ SecretKey aes = (SecretKey) cipher1.unwrap(wrappedSecretKey, "AES", Cipher.SECRET_KEY);
+
+ }
+
+ @DataProvider(name = "publicKey")
+ public Object[][] createKeyPair() {
+ return new Object[][]{
+ {statisticsKeyTool.loadPublicKeyFromClassPath()}
+ };
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/SignatureTest.java b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/SignatureTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..08e254517304dfb89a32417d5d90ffbff639d620
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/SignatureTest.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.security;
+
+import org.testng.annotations.Test;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import java.io.IOException;
+import java.security.*;
+import java.security.cert.CertificateException;
+
+import static org.testng.Assert.assertTrue;
+
+/**
+ * User: steinar
+ * Date: 13.12.12
+ * Time: 15:43
+ */
+public class SignatureTest {
+
+
+ private final String plainText = "The quick brown fox jumped over the lazy dog";
+
+ @Test
+ public void testSigning() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidKeyException, SignatureException {
+
+
+ KeyPair keyPair = generateKeyPair();
+
+ Signature signature = Signature.getInstance("SHA1withDSA");
+
+ PrivateKey privateKey = keyPair.getPrivate();
+
+ signature.initSign(privateKey);
+
+ signature.update(plainText.getBytes());
+
+ byte[] signatureBytes = signature.sign();
+
+
+ Signature signature2 = Signature.getInstance("SHA1withDSA");
+ signature2.initVerify(keyPair.getPublic());
+ signature2.update(plainText.getBytes());
+
+ boolean verifies = signature2.verify(signatureBytes);
+ assertTrue(verifies);
+ }
+
+
+ @Test void testSaveAndReadPublicKey() throws NoSuchProviderException, NoSuchAlgorithmException, KeyStoreException, IOException, CertificateException {
+ KeyPair keyPair = generateKeyPair();
+
+ KeyStore keyStore = KeyStore.getInstance("JCEKS");
+ keyStore.load(null);
+ keyStore.setKeyEntry("dumbo", keyPair.getPrivate().getEncoded(), (java.security.cert.Certificate[]) null);
+ }
+
+
+
+ private String decrypt(byte[] encryptedBytes, PrivateKey aPrivate) throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException {
+ Cipher cipher = Cipher.getInstance("AES");
+
+ cipher.init(Cipher.DECRYPT_MODE, aPrivate);
+ byte[] bytes = cipher.doFinal(encryptedBytes);
+
+ return new String(bytes);
+ }
+
+ private byte[] encrypt(KeyPair keyPair) throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException, IllegalBlockSizeException, BadPaddingException {
+ Cipher cipher = Cipher.getInstance("AES");
+ cipher.init(Cipher.ENCRYPT_MODE, keyPair.getPublic());
+ return cipher.doFinal(plainText.getBytes());
+ }
+
+
+ private KeyPair generateKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException {
+ KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("DSA");
+ SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG", "SUN");
+ keyPairGenerator.initialize(1024, secureRandom);
+
+ return keyPairGenerator.generateKeyPair();
+ }
+
+
+
+
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/StatisticsKeyToolTest.java b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/StatisticsKeyToolTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..870768a4ee8e4190f246c86174544fcf8c0e84f5
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/StatisticsKeyToolTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.security;
+
+import org.testng.annotations.Test;
+
+import java.security.PublicKey;
+
+import static org.testng.Assert.assertNotNull;
+
+/**
+ * Verifies the handling of the statistics public and private keys.
+ *
+ * @author steinar
+ * Date: 01.05.13
+ * Time: 21:36
+ */
+public class StatisticsKeyToolTest {
+
+ @Test
+ public void loadPublicKeyFromClassPath() {
+ StatisticsKeyTool statisticsKeyTool = new StatisticsKeyTool();
+
+ PublicKey publicKey = statisticsKeyTool.loadPublicKeyFromClassPath();
+ assertNotNull(publicKey);
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/SymmetricCipherTest.java b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/SymmetricCipherTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..aae3679409daa4aebbd39b272657cd120dedbc96
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/SymmetricCipherTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.security;
+
+import org.testng.annotations.Test;
+
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+
+/**
+ * @author steinar
+ * Date: 17.09.13
+ * Time: 14:54
+ */
+public class SymmetricCipherTest {
+
+ private static byte[] iv = {0x0a, 0x01, 0x02, 0x03, 0x04, 0x0b, 0x0c, 0x0d};
+
+ private static byte[] encrypt(byte[] inpBytes,
+ SecretKey key, String xform) throws Exception {
+ Cipher cipher = Cipher.getInstance(xform);
+ cipher.init(Cipher.ENCRYPT_MODE, key);
+ return cipher.doFinal(inpBytes);
+ }
+
+ private static byte[] decrypt(byte[] inpBytes,
+ SecretKey key, String xform) throws Exception {
+ Cipher cipher = Cipher.getInstance(xform);
+ cipher.init(Cipher.DECRYPT_MODE, key);
+ return cipher.doFinal(inpBytes);
+ }
+
+ @Test
+ public void testCipher() throws Exception {
+ //String xform = "DES/ECB/PKCS5Padding";
+ String xform = "AES/ECB/PKCS5Padding";
+
+ // Generate a secret key
+ KeyGenerator kg = KeyGenerator.getInstance("AES");
+// kg.init(56); // 56 is the keysize. Fixed for DES
+ SecretKey key = kg.generateKey();
+
+ byte[] dataBytes =
+ new String("J2EE Security for Servlets, EJBs and Web Services " + "\u00e6" + "\u00f8" + "\u00e5" + "\u00c6" + "\u00d8" + "\u00c5").getBytes();
+
+ byte[] encBytes = encrypt(dataBytes, key, xform);
+ byte[] decBytes = decrypt(encBytes, key, xform);
+
+ boolean expected = java.util.Arrays.equals(dataBytes, decBytes);
+ System.out.println("Test " + (expected ? "SUCCEEDED!" : "FAILED!"));
+ }
+
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/util/DateParserTest.java b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/util/DateParserTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..4affc7421220f19d2e20ee93f6df667be79d708f
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/util/DateParserTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.util;
+
+import lombok.extern.slf4j.Slf4j;
+import org.joda.time.DateTime;
+import org.joda.time.MutableDateTime;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author steinar
+ * Date: 25.03.13
+ * Time: 16:08
+ */
+@Slf4j
+public class DateParserTest {
+
+ private String[][] testData = {
+ {"2013", "2013-01-01T00"},
+ {"2013-02", "2013-02-01T00"},
+ {"2013-03-25", "2013-03-25T00"},
+ {"2013-03-25T14", "2013-03-25T14"},
+ {"2013-06-12T23:59", "2013-06-12T23"}
+ };
+
+ @Test
+ public void testDateWithZeroParts() throws Exception {
+
+ DateTimeFormatter dateTimeFormatter = ISODateTimeFormat.dateOptionalTimeParser();
+ DateTimeFormatter dateHourFormat = ISODateTimeFormat.dateHour();
+
+ for (String[] entry : testData) {
+
+ String input = entry[0];
+ String expected = entry[1];
+
+ DateTime dateTime = dateTimeFormatter.parseDateTime(input);
+ MutableDateTime mutableDateTime = dateTime.toMutableDateTimeISO();
+
+ mutableDateTime.setTime(dateTime.getHourOfDay(), 0, 0, 0);
+
+ log.info("{} {} {}", dateTime, dateHourFormat.print(dateTime), mutableDateTime.toDate());
+ Assert.assertEquals(dateHourFormat.print(dateTime), expected);
+
+ }
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/util/StatisticsGranularityTest.java b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/util/StatisticsGranularityTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..bd5bc7f90ac9f66cdc56ba92efbd85dd1b4b904b
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/util/StatisticsGranularityTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.util;
+
+import network.oxalis.statistics.api.StatisticsGranularity;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author steinar
+ * Date: 26.03.13
+ * Time: 09:22
+ */
+public class StatisticsGranularityTest {
+ @Test
+ public void testValueForAbbreviation() throws Exception {
+ StatisticsGranularity g = StatisticsGranularity.valueForAbbreviation("m");
+ Assert.assertEquals(g, StatisticsGranularity.MONTH);
+ }
+
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void testNullAbbreviation() {
+ StatisticsGranularity g = StatisticsGranularity.valueForAbbreviation(null);
+ }
+
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ public void testInvalidAbbreviation() {
+ StatisticsGranularity g = StatisticsGranularity.valueForAbbreviation("x");
+ }
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/util/StatisticsToXmlTransformerTest.java b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/util/StatisticsToXmlTransformerTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..d8ad9ba4e108e77b85931dc98b9accdef7cdc776
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/util/StatisticsToXmlTransformerTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.statistics.util;
+
+import network.oxalis.statistics.api.StatisticsTransformer;
+import network.oxalis.test.identifier.PeppolDocumentTypeIdAcronym;
+import network.oxalis.test.identifier.PeppolProcessTypeIdAcronym;
+import network.oxalis.api.model.Direction;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+
+import static org.testng.Assert.assertTrue;
+
+/**
+ * User: steinar
+ * Date: 24.02.13
+ * Time: 10:46
+ */
+public class StatisticsToXmlTransformerTest {
+
+ private ByteArrayOutputStream byteArrayOutputStream;
+
+ private StatisticsToXmlTransformer transformer;
+
+ @BeforeMethod
+ public void setUp() {
+ byteArrayOutputStream = new ByteArrayOutputStream();
+ transformer = new StatisticsToXmlTransformer(byteArrayOutputStream);
+ }
+
+ @Test
+ public void testWriteSampleStatisticsToXml() throws UnsupportedEncodingException {
+ Date now = new Date();
+ Date start = new Date(now.getTime() - 86400000L);
+ Date end = new Date();
+
+ transformer.startStatistics(start, end);
+ transformer.startEntry();
+ transformer.writeAccessPointIdentifier("AP-0001");
+ transformer.writeParticipantIdentifier("9908:810017902");
+ transformer.writeDirection(Direction.OUT.name());
+ transformer.writePeriod("2013-01-T13");
+ transformer.writeDocumentType(PeppolDocumentTypeIdAcronym.INVOICE.toString());
+ transformer.writeProfileId(PeppolProcessTypeIdAcronym.INVOICE_ONLY.toString());
+ transformer.writeChannel("SR-TEST");
+ transformer.writeCount(10);
+ transformer.endEntry();
+ transformer.endStatistics();
+
+ String s = byteArrayOutputStream.toString("UTF-8");
+
+ assertTrue(s.contains(StatisticsTransformer.STATISTICS_DOCUMENT_START_ELEMENT_NAME));
+ assertTrue(s.contains(StatisticsTransformer.ENTRY_START_ELEMENT_NAME));
+ assertTrue(s.contains(StatisticsTransformer.ACCESS_POINT_ID_ELEMENT_NAME), "Missing " + StatisticsTransformer.PARTICIPANT_ID_ELEMENT_NAME + " element in result");
+ assertTrue(s.contains(StatisticsTransformer.PARTICIPANT_ID_ELEMENT_NAME), "Missing " + StatisticsTransformer.PARTICIPANT_ID_ELEMENT_NAME);
+ assertTrue(s.contains(StatisticsTransformer.CHANNEL_ELEMENT_NAME), "Missing " + StatisticsTransformer.CHANNEL_ELEMENT_NAME);
+ assertTrue(s.contains(StatisticsTransformer.DOCUMENT_TYPE_ELEMENT_NAME));
+ assertTrue(s.contains(StatisticsTransformer.PROFILE_ID_ELEMENT_NAME));
+ assertTrue(s.contains(StatisticsTransformer.COUNT_ELEMENT_NAME));
+
+ System.err.println(s);
+ }
+
+}
diff --git a/oxalis-legacy/oxalis-statistics/src/test/resources/logback-test.xml b/oxalis-legacy/oxalis-statistics/src/test/resources/logback-test.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fa6fe6d582664e4679e8b5741c2995efb870283f
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/test/resources/logback-test.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+ %d %p [%c] %m %n
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oxalis-legacy/oxalis-statistics/src/test/resources/oxalis_home/fake-oxalis.conf b/oxalis-legacy/oxalis-statistics/src/test/resources/oxalis_home/fake-oxalis.conf
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/oxalis-legacy/oxalis-statistics/src/test/resources/oxalis_home/logback-test.xml b/oxalis-legacy/oxalis-statistics/src/test/resources/oxalis_home/logback-test.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9ba0de5fc0e2ef9287cc084396a4efa80f319e31
--- /dev/null
+++ b/oxalis-legacy/oxalis-statistics/src/test/resources/oxalis_home/logback-test.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+ %d %p [%c] %m %n
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/oxalis-outbound/.gitignore b/oxalis-outbound/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..249cda967c11bb62c8affe06d18f26bc5b5f3af0
--- /dev/null
+++ b/oxalis-outbound/.gitignore
@@ -0,0 +1 @@
+/data
\ No newline at end of file
diff --git a/oxalis-outbound/pom.xml b/oxalis-outbound/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9e99cd5e91bfa9a271c51b6ee13cff387fd6cbd4
--- /dev/null
+++ b/oxalis-outbound/pom.xml
@@ -0,0 +1,119 @@
+
+
+
+
+ 4.0.0
+
+
+ dk.erst.oxalis
+ oxalis
+ 0.9.0-e2f4121ccb55b5a60e6edebf7b28d277741d6789
+
+
+ oxalis-outbound
+ jar
+
+ Oxalis :: Core :: Outbound
+ Component for handling sending.
+ https://rep.erst.dk/git/openebusiness/nemhandeledelivery/oxalis
+
+
+ Erhvervsstyrelsen
+ https://nemhandel.dk/
+
+
+
+
+
+
+ dk.erst.oxalis
+ oxalis-commons
+
+
+ dk.erst.oxalis
+ oxalis-document-sniffer
+
+
+ dk.erst.oxalis
+ oxalis-test
+ test
+
+
+
+
+
+ org.apache.commons
+ commons-dbcp2
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+
+
+ ch.qos.logback
+ logback-classic
+ test
+
+
+ org.slf4j
+ jcl-over-slf4j
+
+
+
+
+ network.oxalis.vefa
+ peppol-lookup
+
+
+ network.oxalis.vefa
+ peppol-sbdh
+
+
+ network.oxalis.vefa
+ peppol-security
+
+
+
+
+
+
+ src/main/resources
+ true
+
+
+
+
+ org.jacoco
+ jacoco-maven-plugin
+
+
+
+
+
diff --git a/oxalis-outbound/src/main/java/network/oxalis/outbound/OxalisOutboundComponent.java b/oxalis-outbound/src/main/java/network/oxalis/outbound/OxalisOutboundComponent.java
new file mode 100644
index 0000000000000000000000000000000000000000..31949b058a7f33c411152add807bcda0ff5258fd
--- /dev/null
+++ b/oxalis-outbound/src/main/java/network/oxalis/outbound/OxalisOutboundComponent.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound;
+
+import com.google.inject.Injector;
+import network.oxalis.api.evidence.EvidenceFactory;
+import network.oxalis.api.lookup.LookupService;
+import network.oxalis.api.outbound.TransmissionService;
+import network.oxalis.api.outbound.Transmitter;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import network.oxalis.outbound.transmission.TransmissionRequestBuilder;
+import network.oxalis.outbound.transmission.TransmissionRequestFactory;
+
+/**
+ * Entry point and Object factory for the Oxalis outbound module.
+ *
+ * Should be treated as a singleton when used to make sure Oxalis is not loaded more times than needed.
+ *
+ * @author steinar
+ * @author thore
+ * @author erlend
+ */
+public class OxalisOutboundComponent {
+
+ private Injector injector = GuiceModuleLoader.initiate();
+
+ /**
+ * Retrieves instances of TransmissionRequestBuilder, while not exposing Google Guice to the outside
+ *
+ * @return instance of TransmissionRequestBuilder
+ */
+ public TransmissionRequestBuilder getTransmissionRequestBuilder() {
+ return injector.getInstance(TransmissionRequestBuilder.class);
+ }
+
+ public TransmissionRequestFactory getTransmissionRequestFactory() {
+ return injector.getInstance(TransmissionRequestFactory.class);
+ }
+
+ /**
+ * Retrieves instance of LookupService, without revealing intern object dependency injection.
+ */
+ public LookupService getLookupService() {
+ return injector.getInstance(LookupService.class);
+ }
+
+ /**
+ * Retrieves instance of DefaultTransmitter, without revealing intern object dependency injection.
+ *
+ * @return instance of Transmitter
+ */
+ public Transmitter getTransmitter() {
+ return injector.getInstance(Transmitter.class);
+ }
+
+ public EvidenceFactory getEvidenceFactory() {
+ return injector.getInstance(EvidenceFactory.class);
+ }
+
+ /**
+ * Provides access to the Google Guice injector in order to reuse the component with other components that also uses
+ * Google Guice.
+ *
+ * @return
+ */
+ public Injector getInjector() {
+ return injector;
+ }
+
+ public TransmissionService getTransmissionService() {
+ return injector.getInstance(TransmissionService.class);
+ }
+}
diff --git a/oxalis-outbound/src/main/java/network/oxalis/outbound/lookup/CachedLookupService.java b/oxalis-outbound/src/main/java/network/oxalis/outbound/lookup/CachedLookupService.java
new file mode 100644
index 0000000000000000000000000000000000000000..652ad6447d5f7ead009dd983f224f6245adc72f6
--- /dev/null
+++ b/oxalis-outbound/src/main/java/network/oxalis/outbound/lookup/CachedLookupService.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.lookup;
+
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import com.google.inject.name.Named;
+import network.oxalis.api.lang.OxalisTransmissionException;
+import network.oxalis.api.lookup.LookupService;
+import network.oxalis.api.util.Type;
+import network.oxalis.vefa.peppol.common.model.*;
+import network.oxalis.vefa.peppol.lookup.LookupClient;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author erlend
+ * @since 4.0.0
+ */
+@Singleton
+@Type("cached")
+class CachedLookupService extends CacheLoader implements LookupService {
+
+ private final LookupClient lookupClient;
+
+ private final TransportProfile[] transportProfiles;
+
+ private final LoadingCache cache;
+
+ @Inject
+ public CachedLookupService(LookupClient lookupClient,
+ @Named("prioritized") List transportProfiles) {
+ this.lookupClient = lookupClient;
+ this.transportProfiles = transportProfiles.toArray(new TransportProfile[transportProfiles.size()]);
+
+ this.cache = CacheBuilder.newBuilder()
+ .maximumSize(1000)
+ .expireAfterWrite(5, TimeUnit.MINUTES)
+ .build(this);
+ }
+
+ @Override
+ public Endpoint lookup(Header header) throws OxalisTransmissionException {
+ try {
+ return cache.get(new HeaderStub(header));
+ } catch (ExecutionException e) {
+ throw new OxalisTransmissionException(e.getCause().getMessage(), e.getCause());
+ }
+ }
+
+ @Override
+ public Endpoint load(HeaderStub header) throws Exception {
+ return lookupClient.getEndpoint(header.getReceiver(), header.getDocumentType(),
+ header.getProcess(), transportProfiles);
+ }
+
+ static class HeaderStub {
+
+ private ParticipantIdentifier receiver;
+
+ private DocumentTypeIdentifier documentType;
+
+ private ProcessIdentifier process;
+
+ public HeaderStub(Header header) {
+ this.receiver = header.getReceiver();
+ this.documentType = header.getDocumentType();
+ this.process = header.getProcess();
+ }
+
+ public ParticipantIdentifier getReceiver() {
+ return receiver;
+ }
+
+ public DocumentTypeIdentifier getDocumentType() {
+ return documentType;
+ }
+
+ public ProcessIdentifier getProcess() {
+ return process;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ HeaderStub that = (HeaderStub) o;
+ return Objects.equals(receiver, that.receiver) &&
+ Objects.equals(documentType, that.documentType) &&
+ Objects.equals(process, that.process);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(receiver, documentType, process);
+ }
+ }
+}
diff --git a/oxalis-outbound/src/main/java/network/oxalis/outbound/lookup/DefaultLookupService.java b/oxalis-outbound/src/main/java/network/oxalis/outbound/lookup/DefaultLookupService.java
new file mode 100644
index 0000000000000000000000000000000000000000..1b5bc5276385115e3773357e2c879fb15f944dae
--- /dev/null
+++ b/oxalis-outbound/src/main/java/network/oxalis/outbound/lookup/DefaultLookupService.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.lookup;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import com.google.inject.name.Named;
+import network.oxalis.api.lang.OxalisTransmissionException;
+import network.oxalis.api.lookup.LookupService;
+import network.oxalis.api.util.Type;
+import network.oxalis.vefa.peppol.common.lang.EndpointNotFoundException;
+import network.oxalis.vefa.peppol.common.model.Endpoint;
+import network.oxalis.vefa.peppol.common.model.Header;
+import network.oxalis.vefa.peppol.common.model.TransportProfile;
+import network.oxalis.vefa.peppol.lookup.LookupClient;
+import network.oxalis.vefa.peppol.lookup.api.LookupException;
+import network.oxalis.vefa.peppol.security.lang.PeppolSecurityException;
+
+import java.util.List;
+
+/**
+ * Default implementation of {@link LookupService}. This implementation performs no caching except caching part of
+ * underlying implementations.
+ *
+ * @author erlend
+ * @since 4.0.0
+ */
+@Singleton
+@Type("default")
+class DefaultLookupService implements LookupService {
+
+ /**
+ * LookupClient provided by VEFA PEPPOL project.
+ */
+ private final LookupClient lookupClient;
+
+ /**
+ * Prioritized list of supported transport profiles detected.
+ */
+ private final TransportProfile[] transportProfiles;
+
+ @Inject
+ public DefaultLookupService(LookupClient lookupClient,
+ @Named("prioritized") List transportProfiles) {
+ this.lookupClient = lookupClient;
+ this.transportProfiles = transportProfiles.toArray(new TransportProfile[transportProfiles.size()]);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Endpoint lookup(Header header) throws OxalisTransmissionException {
+ try {
+ return lookupClient.getEndpoint(header, transportProfiles);
+ } catch (LookupException | PeppolSecurityException | EndpointNotFoundException e) {
+ throw new OxalisTransmissionException(e.getMessage(), e);
+ }
+ }
+}
diff --git a/oxalis-outbound/src/main/java/network/oxalis/outbound/lookup/LookupModule.java b/oxalis-outbound/src/main/java/network/oxalis/outbound/lookup/LookupModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..6501b42076a338ec202ac58d95fa457416e14cc1
--- /dev/null
+++ b/oxalis-outbound/src/main/java/network/oxalis/outbound/lookup/LookupModule.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.lookup;
+
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import com.google.inject.name.Names;
+import network.oxalis.api.lookup.LookupService;
+import network.oxalis.commons.guice.OxalisModule;
+import network.oxalis.commons.mode.OxalisCertificateValidator;
+import network.oxalis.vefa.peppol.common.lang.PeppolLoadingException;
+import network.oxalis.vefa.peppol.lookup.LookupClient;
+import network.oxalis.vefa.peppol.lookup.LookupClientBuilder;
+import network.oxalis.vefa.peppol.lookup.api.MetadataFetcher;
+import network.oxalis.vefa.peppol.mode.Mode;
+
+/**
+ * @author erlend
+ * @since 4.0.0
+ */
+public class LookupModule extends OxalisModule {
+
+ @Override
+ protected void configure() {
+ bindTyped(LookupService.class, CachedLookupService.class);
+ bindTyped(LookupService.class, DefaultLookupService.class);
+
+ bind(MetadataFetcher.class)
+ .to(OxalisApacheFetcher.class);
+ }
+
+ @Provides
+ @Singleton
+ protected LookupService getLookupService(Mode mode, Injector injector) {
+ return injector.getInstance(Key.get(LookupService.class, Names.named(mode.getString("oxalis.lookup.service"))));
+ }
+
+ @Provides
+ @Singleton
+ protected LookupClient providesLookupClient(Mode mode, OxalisCertificateValidator certificateValidator,
+ MetadataFetcher fetcher)
+ throws PeppolLoadingException {
+ return LookupClientBuilder.forMode(mode)
+ .fetcher(fetcher)
+ .certificateValidator(certificateValidator)
+ .build();
+ }
+}
diff --git a/oxalis-outbound/src/main/java/network/oxalis/outbound/lookup/OxalisApacheFetcher.java b/oxalis-outbound/src/main/java/network/oxalis/outbound/lookup/OxalisApacheFetcher.java
new file mode 100644
index 0000000000000000000000000000000000000000..69aa3e341db72d06729206a30dff4db22744593e
--- /dev/null
+++ b/oxalis-outbound/src/main/java/network/oxalis/outbound/lookup/OxalisApacheFetcher.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.lookup;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
+import network.oxalis.vefa.peppol.lookup.fetcher.BasicApacheFetcher;
+import network.oxalis.vefa.peppol.mode.Mode;
+import org.apache.http.impl.client.CloseableHttpClient;
+
+/**
+ * @author erlend
+ * @since 4.0.0
+ */
+@Singleton
+class OxalisApacheFetcher extends BasicApacheFetcher {
+
+ private Provider httpClientProvider;
+
+ @Inject
+ public OxalisApacheFetcher(Provider httpClientProvider, Mode mode) {
+ super(mode);
+ this.httpClientProvider = httpClientProvider;
+ }
+
+ @Override
+ protected CloseableHttpClient createClient() {
+ return httpClientProvider.get();
+ }
+}
diff --git a/oxalis-outbound/src/main/java/network/oxalis/outbound/transformer/XmlContentWrapper.java b/oxalis-outbound/src/main/java/network/oxalis/outbound/transformer/XmlContentWrapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..454bd718e51e91904da7c994b10bb0b7c22549f6
--- /dev/null
+++ b/oxalis-outbound/src/main/java/network/oxalis/outbound/transformer/XmlContentWrapper.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.transformer;
+
+import network.oxalis.api.lang.OxalisContentException;
+import network.oxalis.api.transformer.ContentWrapper;
+import network.oxalis.api.util.Type;
+import network.oxalis.vefa.peppol.common.model.Header;
+import network.oxalis.vefa.peppol.sbdh.SbdWriter;
+import network.oxalis.vefa.peppol.sbdh.lang.SbdhException;
+import network.oxalis.vefa.peppol.sbdh.util.XMLStreamUtils;
+
+import javax.inject.Singleton;
+import javax.xml.stream.XMLStreamException;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author erlend
+ * @since 4.0.1
+ */
+@Singleton
+@Type("xml")
+public class XmlContentWrapper implements ContentWrapper {
+
+ @Override
+ public InputStream wrap(InputStream inputStream, Header header) throws IOException, OxalisContentException {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ try (SbdWriter sbdWriter = SbdWriter.newInstance(outputStream, header)) {
+ XMLStreamUtils.copy(inputStream, sbdWriter.xmlWriter());
+ } catch (SbdhException | XMLStreamException e) {
+ throw new OxalisContentException("Unable to wrap content into SBDH.", e);
+ }
+
+ return new ByteArrayInputStream(outputStream.toByteArray());
+ }
+}
diff --git a/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/DefaultTransmissionMessage.java b/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/DefaultTransmissionMessage.java
new file mode 100644
index 0000000000000000000000000000000000000000..01d45628ffdd0f966ea07d05ef7897e3864f7feb
--- /dev/null
+++ b/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/DefaultTransmissionMessage.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.transmission;
+
+import network.oxalis.api.tag.Tag;
+import network.oxalis.api.outbound.TransmissionMessage;
+import network.oxalis.vefa.peppol.common.model.Header;
+
+import java.io.InputStream;
+import java.io.Serializable;
+
+/**
+ * @author erlend
+ * @since 4.0.0
+ */
+class DefaultTransmissionMessage implements TransmissionMessage, Serializable {
+
+ private static final long serialVersionUID = -2292244133544793106L;
+
+ private final Tag tag;
+
+ private final Header header;
+
+ private final InputStream payload;
+
+ public DefaultTransmissionMessage(Header header, InputStream payload, Tag tag) {
+ this.tag = tag;
+ this.header = header;
+ this.payload = payload;
+ }
+
+ @Override
+ public Tag getTag() {
+ return tag;
+ }
+
+ @Override
+ public Header getHeader() {
+ return header;
+ }
+
+ @Override
+ public InputStream getPayload() {
+ return payload;
+ }
+}
diff --git a/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/DefaultTransmissionRequest.java b/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/DefaultTransmissionRequest.java
new file mode 100644
index 0000000000000000000000000000000000000000..70999a6c4e8415e7a7442fbd86db651f6c22f11d
--- /dev/null
+++ b/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/DefaultTransmissionRequest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.transmission;
+
+import network.oxalis.api.tag.Tag;
+import network.oxalis.api.outbound.TransmissionMessage;
+import network.oxalis.api.outbound.TransmissionRequest;
+import network.oxalis.vefa.peppol.common.model.Endpoint;
+import network.oxalis.vefa.peppol.common.model.Header;
+
+import java.io.InputStream;
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * Describes a request to transmit a payload (PEPPOL Document) to a designated end-point.
+ * Instances of this class are to be deemed as value objects, as they are immutable.
+ *
+ * @author steinar
+ * @author thore
+ * @author erlend
+ */
+class DefaultTransmissionRequest implements TransmissionRequest, Serializable {
+
+ private static final long serialVersionUID = -4542158917465140099L;
+
+ private final Tag tag;
+
+ private final Endpoint endpoint;
+
+ private final Header header;
+
+ private final InputStream payload;
+
+ /**
+ * Module private constructor grabbing the constructor data from the supplied builder.
+ */
+ public DefaultTransmissionRequest(Header header, InputStream inputStream, Endpoint endpoint, Tag tag) {
+ this.tag = tag;
+ this.endpoint = endpoint;
+ this.header = header;
+ this.payload = inputStream;
+ }
+
+ public DefaultTransmissionRequest(TransmissionMessage transmissionMessage, Endpoint endpoint) {
+ this.endpoint = endpoint;
+ this.tag = transmissionMessage.getTag();
+ this.header = transmissionMessage.getHeader();
+ this.payload = transmissionMessage.getPayload();
+ }
+
+ @Override
+ public Endpoint getEndpoint() {
+ return endpoint;
+ }
+
+ @Override
+ public Tag getTag() {
+ return tag;
+ }
+
+ @Override
+ public Header getHeader() {
+ return header;
+ }
+
+ @Override
+ public InputStream getPayload() {
+ return payload;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ DefaultTransmissionRequest that = (DefaultTransmissionRequest) o;
+ return Objects.equals(tag, that.tag) &&
+ Objects.equals(endpoint, that.endpoint) &&
+ Objects.equals(header, that.header) &&
+ Objects.equals(payload, that.payload);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(tag, endpoint, header, payload);
+ }
+}
diff --git a/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/DefaultTransmissionService.java b/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/DefaultTransmissionService.java
new file mode 100644
index 0000000000000000000000000000000000000000..11d993b627e0d74433a903c6318153fc0fe5bfb2
--- /dev/null
+++ b/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/DefaultTransmissionService.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.transmission;
+
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import io.opentracing.Span;
+import io.opentracing.Tracer;
+import network.oxalis.api.lang.OxalisContentException;
+import network.oxalis.api.lang.OxalisTransmissionException;
+import network.oxalis.api.tag.Tag;
+import network.oxalis.api.outbound.TransmissionResponse;
+import network.oxalis.api.outbound.TransmissionService;
+import network.oxalis.api.outbound.Transmitter;
+import network.oxalis.commons.tracing.Traceable;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Default implementation of {@link TransmissionService}.
+ *
+ * @author erlend
+ */
+@Singleton
+class DefaultTransmissionService extends Traceable implements TransmissionService {
+
+ private final TransmissionRequestFactory transmissionRequestFactory;
+
+ private final Transmitter transmitter;
+
+ /**
+ * {@inheritDoc}
+ */
+ @Inject
+ public DefaultTransmissionService(TransmissionRequestFactory transmissionRequestFactory,
+ Transmitter transmitter, Tracer tracer) {
+ super(tracer);
+ this.transmissionRequestFactory = transmissionRequestFactory;
+ this.transmitter = transmitter;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public TransmissionResponse send(InputStream inputStream, Tag tag)
+ throws IOException, OxalisTransmissionException, OxalisContentException {
+ Span root = tracer.buildSpan("TransmissionService").start();
+ try {
+ return send(inputStream, tag, root);
+ } finally {
+ root.finish();
+ }
+ }
+
+ @Override
+ public TransmissionResponse send(InputStream inputStream, Tag tag, Span root)
+ throws IOException, OxalisTransmissionException, OxalisContentException {
+ return transmitter.transmit(transmissionRequestFactory.newInstance(inputStream, tag, root), root);
+ }
+}
diff --git a/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/DefaultTransmitter.java b/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/DefaultTransmitter.java
new file mode 100644
index 0000000000000000000000000000000000000000..52994285de0a11e3f79b4c804e59f521f61e985e
--- /dev/null
+++ b/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/DefaultTransmitter.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.transmission;
+
+import com.google.inject.Inject;
+import io.opentracing.Span;
+import io.opentracing.Tracer;
+import network.oxalis.api.error.ErrorTracker;
+import network.oxalis.api.lang.OxalisTransmissionException;
+import network.oxalis.api.lookup.LookupService;
+import network.oxalis.api.model.Direction;
+import network.oxalis.api.outbound.*;
+import network.oxalis.api.statistics.StatisticsService;
+import network.oxalis.api.transmission.TransmissionVerifier;
+import network.oxalis.commons.mode.OxalisCertificateValidator;
+import network.oxalis.commons.tracing.Traceable;
+import network.oxalis.vefa.peppol.common.code.Service;
+import network.oxalis.vefa.peppol.common.model.Endpoint;
+import network.oxalis.vefa.peppol.common.model.TransportProfile;
+import network.oxalis.vefa.peppol.security.lang.PeppolSecurityException;
+
+/**
+ * Executes transmission requests by sending the payload to the requested destination.
+ * Updates statistics for the transmission using the configured RawStatisticsRepository.
+ *
+ * Will log an error if the recording of statistics fails for some reason.
+ *
+ * @author steinar
+ * @author thore
+ * @author erlend
+ */
+class DefaultTransmitter extends Traceable implements Transmitter {
+
+ /**
+ * Factory used to fetch implementation of required transport profile implementation.
+ */
+ private final MessageSenderFactory messageSenderFactory;
+
+ /**
+ * Service to report statistics when transmission is successfully transmitted.
+ */
+ private final StatisticsService statisticsService;
+
+ private final TransmissionVerifier transmissionVerifier;
+
+ private final LookupService lookupService;
+
+ private final OxalisCertificateValidator certificateValidator;
+
+ private final ErrorTracker errorTracker;
+
+ @Inject
+ public DefaultTransmitter(MessageSenderFactory messageSenderFactory, StatisticsService statisticsService,
+ TransmissionVerifier transmissionVerifier, LookupService lookupService, Tracer tracer,
+ OxalisCertificateValidator certificateValidator, ErrorTracker errorTracker) {
+ super(tracer);
+ this.messageSenderFactory = messageSenderFactory;
+ this.statisticsService = statisticsService;
+ this.transmissionVerifier = transmissionVerifier;
+ this.lookupService = lookupService;
+ this.certificateValidator = certificateValidator;
+ this.errorTracker = errorTracker;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public TransmissionResponse transmit(TransmissionMessage transmissionMessage, Span root)
+ throws OxalisTransmissionException {
+ Span span = tracer.buildSpan("transmit").asChildOf(root).start();
+ try {
+ return perform(transmissionMessage, span);
+ } finally {
+ span.finish();
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public TransmissionResponse transmit(TransmissionMessage transmissionMessage) throws OxalisTransmissionException {
+ Span root = tracer.buildSpan("transmit").start();
+ try {
+ return perform(transmissionMessage, root);
+ } finally {
+ root.finish();
+ }
+ }
+
+ private TransmissionResponse perform(TransmissionMessage transmissionMessage, Span root)
+ throws OxalisTransmissionException {
+ try {
+ if (transmissionMessage == null)
+ throw new OxalisTransmissionException("No transmission is provided.");
+
+ transmissionVerifier.verify(transmissionMessage.getHeader(), Direction.OUT);
+
+ TransmissionRequest transmissionRequest;
+ if (transmissionMessage instanceof TransmissionRequest) {
+ transmissionRequest = (TransmissionRequest) transmissionMessage;
+
+ // Validate provided certificate
+ if (transmissionRequest.getEndpoint().getCertificate() == null)
+ throw new OxalisTransmissionException("Certificate of receiving access point is not provided.");
+ certificateValidator.validate(Service.AP, transmissionRequest.getEndpoint().getCertificate(), root);
+ } else {
+ // Perform lookup using header.
+ Span span = tracer.buildSpan("Fetch endpoint information").asChildOf(root).start();
+ Endpoint endpoint;
+ try {
+ endpoint = lookupService.lookup(transmissionMessage.getHeader(), span);
+ span.setTag("transport profile", endpoint.getTransportProfile().getIdentifier());
+ transmissionRequest = new DefaultTransmissionRequest(transmissionMessage, endpoint);
+ } catch (OxalisTransmissionException e) {
+ span.setTag("exception", e.getMessage());
+ throw e;
+ } finally {
+ span.finish();
+ }
+ }
+
+ Span span = tracer.buildSpan("send message").asChildOf(root).start();
+ TransmissionResponse transmissionResponse;
+ try {
+ TransportProfile transportProfile = transmissionRequest.getEndpoint().getTransportProfile();
+ MessageSender messageSender = messageSenderFactory.getMessageSender(transportProfile);
+ transmissionResponse = messageSender.send(transmissionRequest, span);
+ } catch (OxalisTransmissionException e) {
+ span.setTag("exception", e.getMessage());
+ throw e;
+ } finally {
+ span.finish();
+ }
+
+ statisticsService.persist(transmissionRequest, transmissionResponse, root);
+
+ return transmissionResponse;
+ } catch (PeppolSecurityException e) {
+ errorTracker.track(Direction.OUT, e, true);
+ throw new OxalisTransmissionException("Unable to verify certificate of receiving access point.", e);
+ } catch (OxalisTransmissionException e) {
+ errorTracker.track(Direction.OUT, e, true);
+ throw e;
+ } catch (RuntimeException e) {
+ errorTracker.track(Direction.OUT, e, false);
+ throw e;
+ }
+ }
+}
diff --git a/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/MessageSenderFactory.java b/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/MessageSenderFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..fb80d165f03c1c0c1bfe43f10aa9cc5941717041
--- /dev/null
+++ b/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/MessageSenderFactory.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.transmission;
+
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.name.Names;
+import com.typesafe.config.Config;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.api.lang.OxalisTransmissionException;
+import network.oxalis.api.outbound.MessageSender;
+import network.oxalis.vefa.peppol.common.model.TransportProfile;
+import network.oxalis.vefa.peppol.mode.Mode;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * Factory orchestrating available implementations of transport profiles.
+ *
+ * @author erlend
+ */
+@Slf4j
+class MessageSenderFactory {
+
+ /**
+ * Guice injector used to load MessageSender implementation when needed, allows use of non-singleton
+ * implementations. It is not considered best practice to inject injector like this, however in this case is this
+ * suitable based on our requirements.
+ */
+ private final Injector injector;
+
+ /**
+ * Map of configurations for supported transport profiles.
+ */
+ private final Map configMap;
+
+ /**
+ * Prioritized list of supported transport profiles.
+ */
+ private final List prioritizedTransportProfiles;
+
+ @Inject
+ public MessageSenderFactory(Injector injector, Config config, Mode mode) {
+ this.injector = injector;
+
+ // Construct map of configuration for detected transport profiles.
+ configMap = config.getObject("transport").keySet().stream()
+ .map(key -> config.getConfig(String.format("transport.%s", key)))
+ .collect(Collectors.toMap(c -> TransportProfile.of(c.getString("profile")), Function.identity()));
+
+ // Create prioritized list of transport profiles.
+ prioritizedTransportProfiles = Collections.unmodifiableList(configMap.values().stream()
+ .filter(o -> !o.hasPath("enabled") || o.getBoolean("enabled"))
+ .filter(o -> !o.hasPath("modes") || o.getStringList("modes").contains(mode.getIdentifier()))
+ .sorted((o1, o2) -> Integer.compare(o2.getInt("weight"), o1.getInt("weight")))
+ .map(o -> o.getString("profile"))
+ .map(TransportProfile::of)
+ .collect(Collectors.toList()));
+
+ // Logging list of prioritized transport profiles supported.
+ log.info("Prioritized list of transport profiles:");
+ prioritizedTransportProfiles
+ .forEach(tp -> log.info("=> {}", tp.getIdentifier()));
+ }
+
+ /**
+ * Fetch list of supported transport profiles ordered by priority.
+ *
+ * @return List of supported transport profiles.
+ */
+ public List getPrioritizedTransportProfiles() {
+ return prioritizedTransportProfiles;
+ }
+
+ /**
+ * Fetch identifier used in named annotation for the implementation of requested transport profile.
+ *
+ * @param transportProfile Identifier of transport profile requested.
+ * @return String used in the named annotation.
+ * @throws OxalisTransmissionException Thrown when transport profile is not supported.
+ */
+ public String getSender(TransportProfile transportProfile) throws OxalisTransmissionException {
+ if (!configMap.containsKey(transportProfile))
+ throw new OxalisTransmissionException(
+ String.format("Transport protocol '%s' not supported.", transportProfile.getIdentifier()));
+
+ return configMap.get(transportProfile).getString("sender");
+ }
+
+ /**
+ * Fetch MessageSender implementing from provided transport profile.
+ *
+ * @param transportProfile Identifier of transport profile used to fetch MessageSender.
+ * @return MessageSender implementing the transport profile requested.
+ * @throws OxalisTransmissionException Thrown when loading of implementation fails or implementation is not found.
+ */
+ public MessageSender getMessageSender(TransportProfile transportProfile) throws OxalisTransmissionException {
+ return injector.getInstance(Key.get(MessageSender.class, Names.named(getSender(transportProfile))));
+ }
+}
diff --git a/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/TransmissionModule.java b/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/TransmissionModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..051e0507d5211490200788f3c6215d2f2cdb8019
--- /dev/null
+++ b/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/TransmissionModule.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.transmission;
+
+import com.google.inject.Provides;
+import com.google.inject.name.Named;
+import network.oxalis.api.outbound.TransmissionService;
+import network.oxalis.api.outbound.Transmitter;
+import network.oxalis.api.transformer.ContentWrapper;
+import network.oxalis.commons.guice.OxalisModule;
+import network.oxalis.outbound.transformer.XmlContentWrapper;
+import network.oxalis.vefa.peppol.common.model.TransportProfile;
+
+import javax.inject.Singleton;
+import java.util.List;
+
+/**
+ * Guice module orchestrating transmission related classes in transmission package.
+ *
+ * @author steinar
+ * Date: 18.11.2016
+ * Time: 16.10
+ * @author erlend
+ */
+public class TransmissionModule extends OxalisModule {
+
+ @Override
+ protected void configure() {
+ bind(Transmitter.class)
+ .to(DefaultTransmitter.class)
+ .asEagerSingleton();
+
+ bind(TransmissionRequestFactory.class)
+ .asEagerSingleton();
+
+ bind(TransmissionService.class)
+ .to(DefaultTransmissionService.class);
+
+ bind(MessageSenderFactory.class)
+ .asEagerSingleton();
+
+ bindTyped(ContentWrapper.class, XmlContentWrapper.class);
+ }
+
+ /**
+ * Makes the prioritized list of supported transport profiles available to classes needing such a list (lookup...).
+ *
+ * @param messageSenderFactory Factory containing configuration for supported transport profiles.
+ * @return Prioritized list of supported transport profiles.
+ */
+ @Provides
+ @Singleton
+ @Named("prioritized")
+ protected List getTransportProfiles(MessageSenderFactory messageSenderFactory) {
+ return messageSenderFactory.getPrioritizedTransportProfiles();
+ }
+}
diff --git a/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/TransmissionRequestBuilder.java b/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/TransmissionRequestBuilder.java
new file mode 100644
index 0000000000000000000000000000000000000000..42aee3483cefc4a506849ed186c6925a95040669
--- /dev/null
+++ b/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/TransmissionRequestBuilder.java
@@ -0,0 +1,379 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.transmission;
+
+import com.google.common.io.ByteStreams;
+import com.google.inject.Inject;
+import io.opentracing.Span;
+import io.opentracing.Tracer;
+import lombok.extern.slf4j.Slf4j;
+import network.oxalis.api.header.HeaderParser;
+import network.oxalis.api.lang.OxalisContentException;
+import network.oxalis.api.lang.OxalisTransmissionException;
+import network.oxalis.api.lookup.LookupService;
+import network.oxalis.api.model.Direction;
+import network.oxalis.api.outbound.TransmissionRequest;
+import network.oxalis.api.tag.Tag;
+import network.oxalis.api.tag.TagGenerator;
+import network.oxalis.api.transformer.ContentDetector;
+import network.oxalis.sniffer.PeppolStandardBusinessHeader;
+import network.oxalis.sniffer.identifier.InstanceId;
+import network.oxalis.sniffer.sbdh.SbdhWrapper;
+import network.oxalis.vefa.peppol.common.model.DocumentTypeIdentifier;
+import network.oxalis.vefa.peppol.common.model.Endpoint;
+import network.oxalis.vefa.peppol.common.model.ParticipantIdentifier;
+import network.oxalis.vefa.peppol.common.model.ProcessIdentifier;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * @author steinar
+ * @author thore
+ * Date: 04.11.13
+ * Time: 10:04
+ * @author erlend
+ */
+@Slf4j
+public class TransmissionRequestBuilder {
+
+ private final ContentDetector contentDetector;
+
+ private final LookupService lookupService;
+
+ private final TagGenerator tagGenerator;
+
+ private final HeaderParser headerParser;
+
+ private final Tracer tracer;
+
+ private boolean allowOverride;
+
+ /**
+ * Will contain the payload PEPPOL document
+ */
+ private byte[] payload;
+
+ /**
+ * The address of the endpoint either supplied by the caller or looked up in the SMP
+ */
+ private Endpoint endpoint;
+
+ private Tag tag = Tag.NONE;
+
+ /**
+ * The header fields supplied by the caller as opposed to the header fields parsed from the payload
+ */
+ private PeppolStandardBusinessHeader suppliedHeaderFields = new PeppolStandardBusinessHeader();
+
+ /**
+ * The header fields in effect, i.e. merge the parsed header fields with the supplied ones,
+ * giving precedence to the supplied ones.
+ */
+ private PeppolStandardBusinessHeader effectiveStandardBusinessHeader;
+
+ @Inject
+ public TransmissionRequestBuilder(ContentDetector contentDetector, LookupService lookupService,
+ TagGenerator tagGenerator, HeaderParser headerParser, Tracer tracer) {
+ this.contentDetector = contentDetector;
+ this.lookupService = lookupService;
+ this.tagGenerator = tagGenerator;
+ this.headerParser = headerParser;
+ this.tracer = tracer;
+ }
+
+ public void reset() {
+ suppliedHeaderFields = new PeppolStandardBusinessHeader();
+ effectiveStandardBusinessHeader = null;
+ }
+
+ /**
+ * Supplies the builder with the contents of the message to be sent.
+ */
+ public TransmissionRequestBuilder payLoad(InputStream inputStream) {
+ savePayLoad(inputStream);
+ return this;
+ }
+
+ /**
+ * Overrides the endpoint URL and the AS2 System identifier for the AS2 protocol.
+ * You had better know what you are doing :-)
+ */
+ public TransmissionRequestBuilder overrideAs2Endpoint(Endpoint endpoint) {
+ this.endpoint = endpoint;
+ return this;
+ }
+
+ public TransmissionRequestBuilder receiver(ParticipantIdentifier receiverId) {
+ suppliedHeaderFields.setRecipientId(receiverId);
+ return this;
+ }
+
+ public TransmissionRequestBuilder sender(ParticipantIdentifier senderId) {
+ suppliedHeaderFields.setSenderId(senderId);
+ return this;
+ }
+
+ public TransmissionRequestBuilder documentType(DocumentTypeIdentifier documentTypeIdentifier) {
+ suppliedHeaderFields.setDocumentTypeIdentifier(documentTypeIdentifier);
+ return this;
+ }
+
+ public TransmissionRequestBuilder processType(ProcessIdentifier processTypeId) {
+ suppliedHeaderFields.setProfileTypeIdentifier(processTypeId);
+ return this;
+ }
+
+ public TransmissionRequestBuilder instanceId(InstanceId instanceId) {
+ suppliedHeaderFields.setInstanceId(instanceId);
+ return this;
+ }
+
+ public TransmissionRequestBuilder tag(Tag tag) {
+ this.tag = tag;
+ return this;
+ }
+
+ public TransmissionRequest build(Span root) throws OxalisTransmissionException, OxalisContentException {
+ Span span = tracer.buildSpan("build").asChildOf(root).start();
+ try {
+ return build();
+ } finally {
+ span.finish();
+ }
+ }
+
+ /**
+ * Builds the actual {@link TransmissionRequest}.
+ *
+ * The {@link PeppolStandardBusinessHeader} is built as following:
+ *
+ *
+ * - If the payload contains an SBHD, allow override if global "overrideAllowed" flag is set,
+ * otherwise use the one parsed
+ * - If the payload does not contain an SBDH, parseOld payload to determine some of the SBDH attributes
+ * and allow override if global "overrideAllowed" flag is set.
+ *
+ *
+ * @return Prepared transmission request.
+ */
+ public TransmissionRequest build() throws OxalisTransmissionException, OxalisContentException {
+ if (payload.length < 2)
+ throw new OxalisTransmissionException("You have forgotten to provide payload");
+
+ PeppolStandardBusinessHeader optionalParsedSbdh = null;
+ try {
+ optionalParsedSbdh =
+ new PeppolStandardBusinessHeader(headerParser.parse(new ByteArrayInputStream(payload)));
+ } catch (OxalisContentException e) {
+ // No action.
+ }
+
+ // Calculates the effectiveStandardBusinessHeader to be used
+ effectiveStandardBusinessHeader = makeEffectiveSbdh(
+ Optional.ofNullable(optionalParsedSbdh), suppliedHeaderFields);
+
+ // If the endpoint has not been overridden by the caller, look up the endpoint address in
+ // the SMP using the data supplied in the payload
+ if (isEndpointSuppliedByCaller() && isOverrideAllowed()) {
+ log.warn("Endpoint was set by caller not retrieved from SMP, make sure this is intended behaviour.");
+ } else {
+ Endpoint endpoint = lookupService.lookup(effectiveStandardBusinessHeader.toVefa(), null);
+
+ if (isEndpointSuppliedByCaller() && !this.endpoint.equals(endpoint)) {
+ throw new IllegalStateException("You are not allowed to override the EndpointAddress from SMP.");
+ }
+
+ this.endpoint = endpoint;
+ }
+
+ // make sure payload is encapsulated in SBDH
+ if (optionalParsedSbdh == null) {
+ // Wraps the payload with an SBDH, as this is required for AS2
+ payload = wrapPayLoadWithSBDH(new ByteArrayInputStream(payload), effectiveStandardBusinessHeader);
+ }
+
+ // Transfers all the properties of this object into the newly created TransmissionRequest
+ return new DefaultTransmissionRequest(
+ getEffectiveStandardBusinessHeader().toVefa(), getPayload(),
+ getEndpoint(), tagGenerator.generate(Direction.OUT, tag));
+ }
+
+ /**
+ * Merges the SBDH parsed from the payload with the SBDH data supplied by the caller, i.e. the caller wishes to
+ * override the contents of the SBDH parsed. That is, if the payload contains an SBDH
+ *
+ * @param optionalParsedSbdh the SBDH as parsed (extracted) from the payload.
+ * @param peppolSbdhSuppliedByCaller the SBDH data supplied by the caller in order to override data from the payload
+ * @return the merged, effective SBDH created by combining the two data sets
+ */
+ PeppolStandardBusinessHeader makeEffectiveSbdh(Optional optionalParsedSbdh,
+ PeppolStandardBusinessHeader peppolSbdhSuppliedByCaller)
+ throws OxalisContentException {
+ PeppolStandardBusinessHeader effectiveSbdh;
+
+ if (isOverrideAllowed()) {
+ if (peppolSbdhSuppliedByCaller.isComplete()) {
+ // we have sufficient meta data (set explicitly by the caller using API functions)
+ effectiveSbdh = peppolSbdhSuppliedByCaller;
+ } else {
+ // missing meta data, parseOld payload, which does not contain SBHD, in order to deduce missing fields
+ PeppolStandardBusinessHeader parsedPeppolStandardBusinessHeader = parsePayLoadAndDeduceSbdh(optionalParsedSbdh);
+ effectiveSbdh = createEffectiveHeader(parsedPeppolStandardBusinessHeader, peppolSbdhSuppliedByCaller);
+ }
+ } else {
+ // override is not allowed, make sure we do not override any restricted headers
+ PeppolStandardBusinessHeader parsedPeppolStandardBusinessHeader = parsePayLoadAndDeduceSbdh(optionalParsedSbdh);
+ List overriddenHeaders = findRestricedHeadersThatWillBeOverridden(parsedPeppolStandardBusinessHeader, peppolSbdhSuppliedByCaller);
+ if (overriddenHeaders.isEmpty()) {
+ effectiveSbdh = createEffectiveHeader(parsedPeppolStandardBusinessHeader, peppolSbdhSuppliedByCaller);
+ } else {
+ throw new IllegalStateException("Your are not allowed to override " + Arrays.toString(overriddenHeaders.toArray()) + " in production mode, makes sure headers match the ones in the document.");
+ }
+ }
+ if (!effectiveSbdh.isComplete()) {
+ throw new IllegalStateException("TransmissionRequest can not be built, missing " + Arrays.toString(effectiveSbdh.listMissingProperties().toArray()) + " metadata.");
+ }
+
+ return effectiveSbdh;
+ }
+
+
+ private PeppolStandardBusinessHeader parsePayLoadAndDeduceSbdh(
+ Optional optionallyParsedSbdh) throws OxalisContentException {
+ if (optionallyParsedSbdh.isPresent())
+ return optionallyParsedSbdh.get();
+
+ return new PeppolStandardBusinessHeader(contentDetector.parse(new ByteArrayInputStream(payload)));
+ }
+
+ /**
+ * Merges the supplied header fields with the SBDH parsed or derived from the payload thus allowing the caller
+ * to explicitly override whatever has been supplied in the payload.
+ *
+ * @param parsed the PeppolStandardBusinessHeader parsed from the payload
+ * @param supplied the header fields supplied by the caller
+ * @return the merged and effective headers
+ */
+ protected PeppolStandardBusinessHeader createEffectiveHeader(final PeppolStandardBusinessHeader parsed,
+ final PeppolStandardBusinessHeader supplied) {
+
+ // Creates a copy of the original business headers
+ PeppolStandardBusinessHeader mergedHeaders = new PeppolStandardBusinessHeader(parsed);
+
+ if (supplied.getSenderId() != null) {
+ mergedHeaders.setSenderId(supplied.getSenderId());
+ }
+ if (supplied.getRecipientId() != null) {
+ mergedHeaders.setRecipientId(supplied.getRecipientId());
+ }
+ if (supplied.getDocumentTypeIdentifier() != null) {
+ mergedHeaders.setDocumentTypeIdentifier(supplied.getDocumentTypeIdentifier());
+ }
+ if (supplied.getProfileTypeIdentifier() != null) {
+ mergedHeaders.setProfileTypeIdentifier(supplied.getProfileTypeIdentifier());
+ }
+
+ // If instanceId was supplied by caller, use it otherwise, create new
+ if (supplied.getInstanceId() != null) {
+ mergedHeaders.setInstanceId(supplied.getInstanceId());
+ } else {
+ mergedHeaders.setInstanceId(new InstanceId());
+ }
+
+ if (supplied.getCreationDateAndTime() != null) {
+ mergedHeaders.setCreationDateAndTime(supplied.getCreationDateAndTime());
+ }
+
+ return mergedHeaders;
+
+ }
+
+ /**
+ * Returns a list of "restricted" header names that will be overridden when calling #createEffectiveHeader
+ * The restricted header names are SenderId, RecipientId, DocumentTypeIdentifier and ProfileTypeIdentifier
+ * Compares values that exist both as parsed and supplied headers.
+ * Ignores values that only exists in one of them (that allows for sending new and unknown document types)
+ */
+ protected List findRestricedHeadersThatWillBeOverridden(final PeppolStandardBusinessHeader parsed,
+ final PeppolStandardBusinessHeader supplied) {
+ List headers = new ArrayList<>();
+ if ((parsed.getSenderId() != null) && (supplied.getSenderId() != null)
+ && (!supplied.getSenderId().equals(parsed.getSenderId()))) headers.add("SenderId");
+ if ((parsed.getRecipientId() != null) && (supplied.getRecipientId() != null)
+ && (!supplied.getRecipientId().equals(parsed.getRecipientId()))) headers.add("RecipientId");
+ if ((parsed.getDocumentTypeIdentifier() != null) && (supplied.getDocumentTypeIdentifier() != null)
+ && (!supplied.getDocumentTypeIdentifier().equals(parsed.getDocumentTypeIdentifier())))
+ headers.add("DocumentTypeIdentifier");
+ if ((parsed.getProfileTypeIdentifier() != null) && (supplied.getProfileTypeIdentifier() != null)
+ && (!supplied.getProfileTypeIdentifier().equals(parsed.getProfileTypeIdentifier())))
+ headers.add("ProfileTypeIdentifier");
+ return headers;
+ }
+
+ protected PeppolStandardBusinessHeader getEffectiveStandardBusinessHeader() {
+ return effectiveStandardBusinessHeader;
+ }
+
+ protected void savePayLoad(InputStream inputStream) {
+ try {
+ payload = ByteStreams.toByteArray(inputStream);
+ } catch (IOException e) {
+ throw new IllegalStateException("Unable to save the payload: " + e.getMessage(), e);
+ }
+ }
+
+ protected InputStream getPayload() {
+ return new ByteArrayInputStream(payload);
+ }
+
+ public Endpoint getEndpoint() {
+ return endpoint;
+ }
+
+ public boolean isOverrideAllowed() {
+ return allowOverride;
+ }
+
+ private boolean isEndpointSuppliedByCaller() {
+ return endpoint != null;
+ }
+
+ private byte[] wrapPayLoadWithSBDH(ByteArrayInputStream byteArrayInputStream,
+ PeppolStandardBusinessHeader effectiveStandardBusinessHeader) {
+ SbdhWrapper sbdhWrapper = new SbdhWrapper();
+ return sbdhWrapper.wrap(byteArrayInputStream, effectiveStandardBusinessHeader.toVefa());
+ }
+
+ /**
+ * For testing purposes only
+ */
+ public void setTransmissionBuilderOverride(boolean transmissionBuilderOverride) {
+ this.allowOverride = transmissionBuilderOverride;
+ }
+}
diff --git a/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/TransmissionRequestFactory.java b/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/TransmissionRequestFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..d2aebf258ac96b482a016706d2e081e8d80c87dd
--- /dev/null
+++ b/oxalis-outbound/src/main/java/network/oxalis/outbound/transmission/TransmissionRequestFactory.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.transmission;
+
+import io.opentracing.Span;
+import io.opentracing.Tracer;
+import network.oxalis.api.header.HeaderParser;
+import network.oxalis.api.lang.OxalisContentException;
+import network.oxalis.api.model.Direction;
+import network.oxalis.api.outbound.TransmissionMessage;
+import network.oxalis.api.tag.Tag;
+import network.oxalis.api.tag.TagGenerator;
+import network.oxalis.api.transformer.ContentDetector;
+import network.oxalis.api.transformer.ContentWrapper;
+import network.oxalis.commons.io.PeekingInputStream;
+import network.oxalis.commons.tracing.Traceable;
+import network.oxalis.vefa.peppol.common.model.Header;
+
+import javax.inject.Inject;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author erlend
+ * @since 4.0.0
+ */
+public class TransmissionRequestFactory extends Traceable {
+
+ private final ContentDetector contentDetector;
+
+ private final ContentWrapper contentWrapper;
+
+ private final TagGenerator tagGenerator;
+
+ private final HeaderParser headerParser;
+
+ @Inject
+ public TransmissionRequestFactory(ContentDetector contentDetector, ContentWrapper contentWrapper,
+ TagGenerator tagGenerator, HeaderParser headerParser, Tracer tracer) {
+ super(tracer);
+ this.contentDetector = contentDetector;
+ this.contentWrapper = contentWrapper;
+ this.tagGenerator = tagGenerator;
+ this.headerParser = headerParser;
+ }
+
+ public TransmissionMessage newInstance(InputStream inputStream)
+ throws IOException, OxalisContentException {
+ return newInstance(inputStream, Tag.NONE);
+ }
+
+ public TransmissionMessage newInstance(InputStream inputStream, Tag tag)
+ throws IOException, OxalisContentException {
+ Span root = tracer.buildSpan(getClass().getSimpleName()).start();
+ try {
+ return perform(inputStream, tag, root);
+ } finally {
+ root.finish();
+ }
+ }
+
+ public TransmissionMessage newInstance(InputStream inputStream, Span root)
+ throws IOException, OxalisContentException {
+ return newInstance(inputStream, Tag.NONE, root);
+ }
+
+ public TransmissionMessage newInstance(InputStream inputStream, Tag tag, Span root)
+ throws IOException, OxalisContentException {
+ Span span = tracer.buildSpan(getClass().getSimpleName()).asChildOf(root).start();
+ try {
+ return perform(inputStream, tag, span);
+ } finally {
+ span.finish();
+ }
+ }
+
+ private TransmissionMessage perform(InputStream inputStream, Tag tag, Span root)
+ throws IOException, OxalisContentException {
+ PeekingInputStream peekingInputStream = new PeekingInputStream(inputStream);
+
+ // Read header from content to send.
+ Header header;
+ try {
+ // Read header from SBDH.
+ Span span = tracer.buildSpan("Reading SBDH").asChildOf(root).start();
+ try {
+ header = headerParser.parse(peekingInputStream);
+ span.setTag("identifier", header.getIdentifier().getIdentifier());
+ } catch (OxalisContentException e) {
+ span.setTag("exception", e.getMessage());
+ throw e;
+ } finally {
+ span.finish();
+ }
+
+ // Create transmission request.
+ return new DefaultTransmissionMessage(header, peekingInputStream.newInputStream(),
+ tagGenerator.generate(Direction.OUT, tag));
+ } catch (OxalisContentException e) {
+ byte[] payload = peekingInputStream.getContent();
+
+ // Detect header from content.
+ Span span = tracer.buildSpan("Detect SBDH from content").asChildOf(root).start();
+ try {
+ header = contentDetector.parse(new ByteArrayInputStream(payload));
+ span.setTag("identifier", header.getIdentifier().getIdentifier());
+ } catch (OxalisContentException ex) {
+ span.setTag("exception", ex.getMessage());
+ throw new OxalisContentException(ex.getMessage(), ex);
+ } finally {
+ span.finish();
+ }
+
+ // Wrap content in SBDH.
+ span = tracer.buildSpan("Wrap content in SBDH").asChildOf(root).start();
+ InputStream wrappedContent;
+ try {
+ wrappedContent = contentWrapper.wrap(new ByteArrayInputStream(payload), header);
+ } catch (OxalisContentException ex) {
+ span.setTag("exception", ex.getMessage());
+ throw ex;
+ } finally {
+ span.finish();
+ }
+
+ // Create transmission request.
+ return new DefaultTransmissionMessage(header, wrappedContent, tagGenerator.generate(Direction.OUT, tag));
+ }
+ }
+}
diff --git a/oxalis-outbound/src/main/resources/reference.conf b/oxalis-outbound/src/main/resources/reference.conf
new file mode 100644
index 0000000000000000000000000000000000000000..3893f18a5a0165b1994c51f1bf3d8098ec3a21a1
--- /dev/null
+++ b/oxalis-outbound/src/main/resources/reference.conf
@@ -0,0 +1,4 @@
+oxalis.module.outbound.lookup.class = network.oxalis.outbound.lookup.LookupModule
+oxalis.module.outbound.transmission.class = network.oxalis.outbound.transmission.TransmissionModule
+
+mode.default.oxalis.lookup.service = cached
\ No newline at end of file
diff --git a/oxalis-outbound/src/test/java/javax/XmlEncodingTest.java b/oxalis-outbound/src/test/java/javax/XmlEncodingTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..f91509ac2c323b01363fbedccc581414a0091bb2
--- /dev/null
+++ b/oxalis-outbound/src/test/java/javax/XmlEncodingTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package javax;
+
+import org.testng.annotations.Test;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.*;
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
+/**
+ * @author Steinar Overbeck Cook
+ * Date: 26.12.11
+ * Time: 14:08
+ */
+public class XmlEncodingTest {
+
+ protected static final String EHF_TEST_SEND_REGNING_HELSE_VEST2_XML = "ehf-test-SendRegning-HelseVest2.xml";
+
+ /**
+ * Parses an XML file and verifies that the address contained in
+ * /Invoice/AccountingSupplierParty/Party/PostalAddress/StreetName/text()
+ * the
+ */
+ @Test
+ public void testXmlEncoding() throws ParserConfigurationException, IOException, SAXException,
+ XPathExpressionException, URISyntaxException {
+
+ URL url = XmlEncodingTest.class.getClassLoader().getResource(EHF_TEST_SEND_REGNING_HELSE_VEST2_XML);
+ assertNotNull(url, EHF_TEST_SEND_REGNING_HELSE_VEST2_XML + " not found in classpath");
+
+ DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+ documentBuilderFactory.setNamespaceAware(false);
+ DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
+
+ File file = new File(url.toURI());
+ Document document = documentBuilder.parse(file);
+
+ XPathFactory xPathFactory = XPathFactory.newInstance();
+ XPath xPath = xPathFactory.newXPath();
+ XPathExpression expr = xPath.compile("/Invoice/AccountingSupplierParty/Party/PostalAddress/StreetName/text()");
+ String s = (String) expr.evaluate(document, XPathConstants.STRING);
+
+ assertEquals(s, "\u00D8stre Aker vei 243H");
+ }
+}
diff --git a/oxalis-outbound/src/test/java/network/oxalis/outbound/OxalisOutboundComponentTest.java b/oxalis-outbound/src/test/java/network/oxalis/outbound/OxalisOutboundComponentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..f207afb791c7ab30500dd8f28adb542b1f1d0c84
--- /dev/null
+++ b/oxalis-outbound/src/test/java/network/oxalis/outbound/OxalisOutboundComponentTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * @author steinar
+ * Date: 18.11.2016
+ * Time: 16.32
+ */
+public class OxalisOutboundComponentTest {
+
+ @Test
+ public void testGetters() throws Exception {
+ OxalisOutboundComponent oxalisOutboundComponent = new OxalisOutboundComponent();
+
+ Assert.assertNotNull(oxalisOutboundComponent.getTransmissionRequestBuilder());
+ Assert.assertNotNull(oxalisOutboundComponent.getTransmissionRequestFactory());
+ Assert.assertNotNull(oxalisOutboundComponent.getLookupService());
+ Assert.assertNotNull(oxalisOutboundComponent.getTransmitter());
+ Assert.assertNotNull(oxalisOutboundComponent.getEvidenceFactory());
+ Assert.assertNotNull(oxalisOutboundComponent.getInjector());
+ Assert.assertNotNull(oxalisOutboundComponent.getTransmissionService());
+ }
+}
diff --git a/oxalis-outbound/src/test/java/network/oxalis/outbound/guice/TestResourceModule.java b/oxalis-outbound/src/test/java/network/oxalis/outbound/guice/TestResourceModule.java
new file mode 100644
index 0000000000000000000000000000000000000000..1b5cf5e8b209b6e3b626d03902cd20b5336ca1ab
--- /dev/null
+++ b/oxalis-outbound/src/test/java/network/oxalis/outbound/guice/TestResourceModule.java
@@ -0,0 +1,308 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.guice;
+
+import com.google.inject.Provides;
+import com.google.inject.name.Named;
+import network.oxalis.commons.guice.OxalisModule;
+import network.oxalis.sniffer.PeppolStandardBusinessHeader;
+import network.oxalis.sniffer.identifier.CustomizationIdentifier;
+import network.oxalis.sniffer.identifier.PeppolDocumentTypeId;
+import network.oxalis.test.identifier.WellKnownParticipant;
+import network.oxalis.vefa.peppol.common.model.ParticipantIdentifier;
+import network.oxalis.vefa.peppol.common.model.ProcessIdentifier;
+
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.testng.Assert.assertNotNull;
+
+/**
+ * Guice module providing different testfiles used by unit tests
+ *
+ * @author steinar
+ * @author thore
+ */
+public class TestResourceModule extends OxalisModule {
+
+ public static final String PEPPOL_BIS_INVOICE_SBD_XML = "/peppol-bis-invoice-sbdh.xml";
+
+ public static final String EHF_T10_ALLE_ELEMENTER_XML = "/ehf-bii05-t10-valid-invoice.xml";
+
+ public static final String EHF_T10_MANGLER_ELEMENTER_XML = "/ehf-t10-mangler-elementer.xml";
+
+ @Override
+ protected void configure() { /* nothing */ }
+
+ /**
+ * All InputStream annotated with
+ * @Inject @Named("sampleXml"), will have an instance of this InputStream injected.
+ *
+ * @return InputStream connected to PEPPOL_BIS_INVOICE_SBD_XML
+ */
+ @Provides
+ @Named("sample-xml-with-sbdh")
+ public InputStream getSampleXmlInputStream() {
+ InputStream resourceAsStream = getClass().getResourceAsStream(PEPPOL_BIS_INVOICE_SBD_XML);
+ assertNotNull(resourceAsStream, "Unable to load " + PEPPOL_BIS_INVOICE_SBD_XML + " from class path");
+ return resourceAsStream;
+ }
+
+ @Provides
+ @Named("sample-xml-no-sbdh")
+ public InputStream getSampleXmlInputStreamWithoutSbdh() {
+ InputStream inputStream = getClass().getResourceAsStream(EHF_T10_ALLE_ELEMENTER_XML);
+ assertNotNull(inputStream, "Unable to load " + EHF_T10_ALLE_ELEMENTER_XML + " from class path");
+ return inputStream;
+ }
+
+ @Provides
+ @Named("sample-xml-missing-metadata")
+ public InputStream getSampleXmlInputStreamWithMissingMetadata() {
+ InputStream inputStream = getClass().getResourceAsStream(EHF_T10_MANGLER_ELEMENTER_XML);
+ assertNotNull(inputStream, "Unable to load " + EHF_T10_MANGLER_ELEMENTER_XML + " from class path");
+ return inputStream;
+ }
+
+ /**
+ * Provides a Map of resource names and their PeppolStandardBusinessHeader "facit".
+ * Extend the number of testfiles and update this list to automatically test decoding of new formats.
+ */
+ @Provides
+ @Named("test-files-with-identification")
+ public Map getTestData() {
+ Map map = new HashMap<>();
+
+ //
+ // example Despatch Advice scenario files
+ //
+
+ map.put("DespatchAdvice/1.0/Eksempel1.xml", createPeppolStandardBusinessHeader(
+ "DespatchAdvice", "urn:oasis:names:specification:ubl:schema:xsd:DespatchAdvice-2", "2.1",
+ "urn:www.cenbii.eu:transaction:biitrns016:ver1.0" +
+ ":extended:urn:www.peppol.eu:bis:peppol30a:ver1.0" +
+ ":extended:urn:www.difi.no:ehf:pakkseddel:ver1.0",
+ "9908:810018909", "9908:976098897", "urn:www.cenbii.eu:profile:bii30:ver2.0"));
+
+ map.put("DespatchAdvice/1.0/Eksempel2.xml", createPeppolStandardBusinessHeader(
+ "DespatchAdvice", "urn:oasis:names:specification:ubl:schema:xsd:DespatchAdvice-2", "2.1",
+ "urn:www.cenbii.eu:transaction:biitrns016:ver1.0" +
+ ":extended:urn:www.peppol.eu:bis:peppol30a:ver1.0" +
+ ":extended:urn:www.difi.no:ehf:pakkseddel:ver1.0",
+ "9908:810018909", "9908:976098897", "urn:www.cenbii.eu:profile:bii30:ver2.0"));
+
+ map.put("DespatchAdvice/1.0/Eksempel3.xml", createPeppolStandardBusinessHeader(
+ "DespatchAdvice", "urn:oasis:names:specification:ubl:schema:xsd:DespatchAdvice-2", "2.1",
+ "urn:www.cenbii.eu:transaction:biitrns016:ver1.0" +
+ ":extended:urn:www.peppol.eu:bis:peppol30a:ver1.0",
+ "9908:810018909", "9908:976098897", "urn:www.cenbii.eu:profile:bii30:ver2.0"));
+
+ map.put("DespatchAdvice/1.0/Eksempel4.xml", createPeppolStandardBusinessHeader(
+ "DespatchAdvice", "urn:oasis:names:specification:ubl:schema:xsd:DespatchAdvice-2", "2.1",
+ "urn:www.cenbii.eu:transaction:biitrns016:ver1.0" +
+ ":extended:urn:www.peppol.eu:bis:peppol30a:ver1.0" +
+ ":extended:urn:www.difi.no:ehf:pakkseddel:ver1.0",
+ "9908:810018909", "9908:976098897", "urn:www.cenbii.eu:profile:bii30:ver2.0"));
+
+ map.put("DespatchAdvice/1.0/Eksempel5.xml", createPeppolStandardBusinessHeader(
+ "DespatchAdvice", "urn:oasis:names:specification:ubl:schema:xsd:DespatchAdvice-2", "2.1",
+ "urn:www.cenbii.eu:transaction:biitrns016:ver1.0" +
+ ":extended:urn:www.peppol.eu:bis:peppol30a:ver1.0" +
+ ":extended:urn:www.difi.no:ehf:pakkseddel:ver1.0",
+ "9908:810018909", "9908:976098897", "urn:www.cenbii.eu:profile:bii30:ver2.0"));
+
+ //
+ // example Catalogue scenario files
+ //
+
+ map.put("EHFCatalogue/1.0/Example file EHF Catalogue Response.xml", createPeppolStandardBusinessHeader(
+ "ApplicationResponse", "urn:oasis:names:specification:ubl:schema:xsd:ApplicationResponse-2", "2.1",
+ "urn:www.cenbii.eu:transaction:biitrns058:ver2.0" +
+ ":extended:urn:www.peppol.eu:bis:peppol1a:ver2.0" +
+ ":extended:urn:www.difi.no:ehf:katalogbekreftelse:ver1.0",
+ "9908:976098897", "9908:810018909", "urn:www.cenbii.eu:profile:biiI02:ver2.0"));
+
+ map.put("EHFCatalogue/1.0/Example file EHF Catalogue.xml", createPeppolStandardBusinessHeader(
+ "Catalogue", "urn:oasis:names:specification:ubl:schema:xsd:Catalogue-2", "2.1",
+ "urn:www.cenbii.eu:transaction:biitrns019:ver2.0" +
+ ":extended:urn:www.peppol.eu:bis:peppol1a:ver2.0" +
+ ":extended:urn:www.difi.no:ehf:katalog:ver1.0",
+ "9908:976098897", "9908:810018909", "urn:www.cenbii.eu:profile:bii01:ver2.0"));
+
+ //
+ // example Invoice scenario files
+ //
+
+ map.put("EHFInvoice/1.6/T14-norsk-profil05.xml", createPeppolStandardBusinessHeader(
+ "CreditNote", "urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2", "2.0",
+ "urn:www.cenbii.eu:transaction:biicoretrdm014:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol5a:ver1.0" +
+ "#urn:www.difi.no:ehf:kreditnota:ver1",
+ "9908:977187761", "9908:810305282", "urn:www.cenbii.eu:profile:bii05:ver1.0"));
+
+ map.put("EHFInvoice/1.6/T14-norsk-profil05-without-endpointid.xml", createPeppolStandardBusinessHeader(
+ "CreditNote", "urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2", "2.0",
+ "urn:www.cenbii.eu:transaction:biicoretrdm014:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol5a:ver1.0" +
+ "#urn:www.difi.no:ehf:kreditnota:ver1",
+ "9908:977187761", "9908:810305282", "urn:www.cenbii.eu:profile:bii05:ver1.0"));
+
+ map.put("EHFInvoice/1.6/T14-norsk-profilxx.xml", createPeppolStandardBusinessHeader(
+ "CreditNote", "urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2", "2.0",
+ "urn:www.cenbii.eu:transaction:biicoretrdm014:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol5a:ver1.0" +
+ "#urn:www.difi.no:ehf:kreditnota:ver1",
+ "9908:977187761", "9908:810305282", "urn:www.cenbii.eu:profile:biixx:ver1.0"));
+
+ map.put("EHFInvoice/1.6/T14-norsk-profilxy.xml", createPeppolStandardBusinessHeader(
+ "CreditNote", "urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2", "2.0",
+ "urn:www.cenbii.eu:transaction:biicoretrdm014:ver1.0" +
+ ":#urn:www.cenbii.eu:profile:biixy:ver1.0" +
+ "#urn:www.difi.no:ehf:kreditnota:ver1",
+ "9908:977187761", "9908:810305282", "urn:www.cenbii.eu:profile:biixy:ver1.0"));
+
+ map.put("EHFInvoice/1.6/T14-utland-profil05.xml", createPeppolStandardBusinessHeader(
+ "CreditNote", "urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2", "2.0",
+ "urn:www.cenbii.eu:transaction:biicoretrdm014:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol5a:ver1.0",
+ "9908:977187761", "9908:810305282", "urn:www.cenbii.eu:profile:bii05:ver1.0"));
+
+ map.put("EHFInvoice/2.0/T10-B2C.xml", createPeppolStandardBusinessHeader(
+ "Invoice", "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2", "2.1",
+ "urn:www.cenbii.eu:transaction:biitrns010:ver2.0" +
+ ":extended:urn:www.peppol.eu:bis:peppol5a:ver2.0" +
+ ":extended:urn:www.difi.no:ehf:faktura:ver2.0",
+ "9908:810018909", "9908:976098897", "urn:www.cenbii.eu:profile:bii05:ver2.0"));
+
+ map.put("EHFInvoice/2.0/T10-Valuta-EUR.xml", createPeppolStandardBusinessHeader(
+ "Invoice", "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2", "2.1",
+ "urn:www.cenbii.eu:transaction:biitrns010:ver2.0" +
+ ":extended:urn:www.peppol.eu:bis:peppol5a:ver2.0" +
+ ":extended:urn:www.difi.no:ehf:faktura:ver2.0",
+ "9908:810018909", "9908:976098897", "urn:www.cenbii.eu:profile:bii05:ver2.0"));
+
+ map.put("EHFInvoice/2.0/T14-Valuta-EUR.xml", createPeppolStandardBusinessHeader(
+ "CreditNote", "urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2", "2.1",
+ "urn:www.cenbii.eu:transaction:biitrns014:ver2.0" +
+ ":extended:urn:www.peppol.eu:bis:peppol5a:ver2.0" +
+ ":extended:urn:www.difi.no:ehf:kreditnota:ver2.0",
+ "9908:810018909", "9908:976098897", "urn:www.cenbii.eu:profile:bii05:ver2.0"));
+
+ //
+ // example Order scenario files
+ //
+
+ map.put("EHFOrder/1.0/Eksempelfil EHF Ordre.xml", createPeppolStandardBusinessHeader(
+ "Order", "urn:oasis:names:specification:ubl:schema:xsd:Order-2", "2.1",
+ "urn:www.cenbii.eu:transaction:biitrns001:ver2.0" +
+ ":extended:urn:www.peppol.eu:bis:peppol28a:ver1.0" +
+ ":extended:urn:www.difi.no:ehf:ordre:ver1.0",
+ "9908:976098897",
+ WellKnownParticipant.DIFI_TEST.getIdentifier(), "urn:www.cenbii.eu:profile:bii28:ver2.0"));
+
+ map.put("EHFOrder/1.0/Eksempelfil EHF Ordrebekreftelse.xml", createPeppolStandardBusinessHeader(
+ "OrderResponse", "urn:oasis:names:specification:ubl:schema:xsd:OrderResponse-2", "2.1",
+ "urn:www.cenbii.eu:transaction:biitrns076:ver2.0" +
+ ":extended:urn:www.peppol.eu:bis:peppol28a:ver1.0" +
+ ":extended:urn:www.difi.no:ehf:ordrebekreftelse:ver1.0",
+ "9908:810018909", "9908:976098897", "urn:www.cenbii.eu:profile:bii28:ver2.0"));
+
+ map.put("EHFOrder/SimpleOrderResponse.xml", createPeppolStandardBusinessHeader(
+ "OrderResponseSimple", "urn:oasis:names:specification:ubl:schema:xsd:OrderResponseSimple-2", "2.0",
+ "urn:www.cenbii.eu:transaction:biicoretrdm003:ver1.0" +
+ ":#urn:www.peppol.eu:bis:peppol6a:ver1.0",
+ "9908:999999999", "9908:000000000", "urn:www.cenbii.eu:profile:bii06:ver1.0"));
+
+ //
+ // example Reminder scenario files
+ //
+
+ map.put("EHFReminder/1.6/T17-norsk-profilxy.xml", createPeppolStandardBusinessHeader(
+ "Reminder", "urn:oasis:names:specification:ubl:schema:xsd:Reminder-2", "2.0",
+ "urn:www.cenbii.eu:transaction:biicoretrdm017:ver1.0" +
+ ":#urn:www.cenbii.eu:profile:biixy:ver1.0" +
+ "#urn:www.difi.no:ehf:purring:ver1",
+ "9908:810018909",
+ WellKnownParticipant.DIFI_TEST.getIdentifier(), "urn:www.cenbii.eu:profile:biixy:ver1.0"));
+
+ //
+ // example Message Level Response scenario files
+ //
+
+ map.put("MessageLevelResponse/1.0/Use Case1.xml", createPeppolStandardBusinessHeader(
+ "ApplicationResponse", "urn:oasis:names:specification:ubl:schema:xsd:ApplicationResponse-2", "2.1",
+ "urn:www.cenbii.eu:transaction:biitrns071:ver2.0" +
+ ":extended:urn:www.peppol.eu:bis:peppol36a:ver1.0",
+ "9908:981915550", "9908:976098897", "urn:www.cenbii.eu:profile:bii36:ver2.0"));
+
+ map.put("MessageLevelResponse/1.0/Use Case2.xml", createPeppolStandardBusinessHeader(
+ "ApplicationResponse", "urn:oasis:names:specification:ubl:schema:xsd:ApplicationResponse-2", "2.1",
+ "urn:www.cenbii.eu:transaction:biitrns071:ver2.0" +
+ ":extended:urn:www.peppol.eu:bis:peppol36a:ver1.0",
+ "9908:981915550", "9908:976098897", "urn:www.cenbii.eu:profile:bii36:ver2.0"));
+
+ map.put("MessageLevelResponse/1.0/Use Case3.xml", createPeppolStandardBusinessHeader(
+ "ApplicationResponse", "urn:oasis:names:specification:ubl:schema:xsd:ApplicationResponse-2", "2.1",
+ "urn:www.cenbii.eu:transaction:biitrns071:ver2.0" +
+ ":extended:urn:www.peppol.eu:bis:peppol36a:ver1.0",
+ "9908:981915550", "9908:976098897", "urn:www.cenbii.eu:profile:bii36:ver2.0"));
+
+ return map;
+ }
+
+ /**
+ * Provides a Map of non-UBL type resource names and PeppolStandardBusinessHeader data.
+ * Oxalis should allow new or unknown formats to be transported using PEPPOL.
+ */
+ @Provides
+ @Named("test-non-ubl-documents")
+ public Map getNonUBLTestData() {
+ Map map = new HashMap<>();
+
+ //
+ // example non-UBL document scenario (contributed by Jacob Lund Mogensen), should be allowed
+ //
+
+ map.put("OIOXML/OIOXML_PCM_99018008_ValidKnown-Original.xml", createPeppolStandardBusinessHeader(
+ "Invoice", "http://rep.oio.dk/ubl/xml/schemas/0p71/pcm/", "1.0",
+ "urn:customization",
+ "9908:810018909", "9902:99018008", "urn:profile"));
+
+ return map;
+ }
+
+ private PeppolStandardBusinessHeader createPeppolStandardBusinessHeader(
+ String localname, String namespace, String version,
+ String customization,
+ String sender, String receiver, String profileId) {
+ PeppolStandardBusinessHeader p = PeppolStandardBusinessHeader.createPeppolStandardBusinessHeaderWithNewDate();
+ p.setDocumentTypeIdentifier(new PeppolDocumentTypeId(namespace, localname,
+ new CustomizationIdentifier(customization), version).toVefa());
+ p.setSenderId(ParticipantIdentifier.of(sender));
+ p.setRecipientId(ParticipantIdentifier.of(receiver));
+ p.setProfileTypeIdentifier(ProcessIdentifier.of(profileId));
+ return p;
+ }
+
+}
diff --git a/oxalis-outbound/src/test/java/network/oxalis/outbound/lookup/CachedLookupServiceTest.java b/oxalis-outbound/src/test/java/network/oxalis/outbound/lookup/CachedLookupServiceTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..fe6c2db964bede8e9567c18546afca5794d80147
--- /dev/null
+++ b/oxalis-outbound/src/test/java/network/oxalis/outbound/lookup/CachedLookupServiceTest.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.lookup;
+
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+import network.oxalis.api.lang.OxalisTransmissionException;
+import network.oxalis.api.lookup.LookupService;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import network.oxalis.vefa.peppol.common.model.*;
+import org.testng.Assert;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Ignore;
+import org.testng.annotations.Test;
+
+@Guice(modules = GuiceModuleLoader.class)
+public class CachedLookupServiceTest {
+
+ private static ParticipantIdentifier participant = ParticipantIdentifier.of("0208:0871221633");
+
+ private static DocumentTypeIdentifier documenttype = DocumentTypeIdentifier.of(
+ "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##" +
+ "urn:cen.eu:en16931:2017#compliant#" +
+ "urn:fdc:peppol.eu:2017:poacc:billing:3.0" +
+ "::2.1", DocumentTypeIdentifier.BUSDOX_DOCID_QNS_SCHEME);
+
+ private static ProcessIdentifier process = ProcessIdentifier.of("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0");
+
+ @Inject
+ @Named("cached")
+ private LookupService lookupService;
+
+ // This test is ignored due to UAN-318 - Fjern AS2 protokollen fra Oxalis AP. AS2 no longer supported. Hence the endpoint no longer exists
+ @Ignore
+ @Test
+ public void simple() throws Exception {
+ Endpoint endpoint = lookupService.lookup(Header.newInstance()
+ .receiver(participant)
+ .documentType(documenttype)
+ .process(process));
+
+ Assert.assertNotNull(endpoint);
+ }
+
+ // This test is ignored due to UAN-318 - Fjern AS2 protokollen fra Oxalis AP. AS2 no longer supported. Hence the endpoint no longer exists
+ @Ignore
+ @Test
+ public void simpleCached() throws Exception {
+ Endpoint endpoint1 = lookupService.lookup(Header.newInstance()
+ .receiver(participant)
+ .documentType(documenttype)
+ .process(process));
+
+ Endpoint endpoint2 = lookupService.lookup(Header.newInstance()
+ .receiver(participant)
+ .documentType(documenttype)
+ .process(process));
+
+ Assert.assertSame(endpoint1, endpoint2);
+ }
+
+ @Test(expectedExceptions = OxalisTransmissionException.class)
+ public void triggerException() throws Exception {
+ lookupService.lookup(Header.newInstance()
+ .receiver(ParticipantIdentifier.of("9908:---"))
+ .documentType(documenttype)
+ .process(process));
+ }
+
+ @Test
+ public void simpleHeaderStub() {
+ CachedLookupService.HeaderStub headerStub = new CachedLookupService.HeaderStub(Header.newInstance()
+ .receiver(participant)
+ .documentType(documenttype)
+ .process(process));
+
+ Assert.assertTrue(headerStub.equals(new CachedLookupService.HeaderStub(Header.newInstance()
+ .receiver(participant)
+ .documentType(documenttype)
+ .process(process))));
+ Assert.assertFalse(headerStub.equals(new CachedLookupService.HeaderStub(Header.newInstance()
+ .receiver(ParticipantIdentifier.of("9908:---"))
+ .documentType(documenttype)
+ .process(process))));
+ Assert.assertFalse(headerStub.equals(new CachedLookupService.HeaderStub(Header.newInstance()
+ .receiver(participant)
+ .documentType(DocumentTypeIdentifier.of("---"))
+ .process(process))));
+ Assert.assertFalse(headerStub.equals(new CachedLookupService.HeaderStub(Header.newInstance()
+ .receiver(participant)
+ .documentType(documenttype)
+ .process(ProcessIdentifier.of("---")))));
+ }
+}
diff --git a/oxalis-outbound/src/test/java/network/oxalis/outbound/lookup/DefaultLookupServiceTest.java b/oxalis-outbound/src/test/java/network/oxalis/outbound/lookup/DefaultLookupServiceTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..103063540bbe379dd4d93107c5f7b7b20c2566be
--- /dev/null
+++ b/oxalis-outbound/src/test/java/network/oxalis/outbound/lookup/DefaultLookupServiceTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.lookup;
+
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+import network.oxalis.api.lang.OxalisTransmissionException;
+import network.oxalis.api.lookup.LookupService;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import network.oxalis.vefa.peppol.common.model.*;
+import org.testng.Assert;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Ignore;
+import org.testng.annotations.Test;
+
+@Guice(modules = GuiceModuleLoader.class)
+public class DefaultLookupServiceTest {
+
+ @Inject
+ @Named("default")
+ private LookupService lookupService;
+
+ // This test is ignored due to UAN-318 - Fjern AS2 protokollen fra Oxalis AP. AS2 no longer supported. Hence the endpoint no longer exists
+ @Ignore
+ @Test
+ public void simple() throws Exception {
+ Endpoint endpoint = lookupService.lookup(Header.newInstance()
+ .receiver(ParticipantIdentifier.of("0208:0871221633"))
+ .documentType(DocumentTypeIdentifier.of("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1"))
+ .process(ProcessIdentifier.of("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")));
+
+ Assert.assertNotNull(endpoint);
+ }
+
+ // This test is ignored due to UAN-318 - Fjern AS2 protokollen fra Oxalis AP. AS2 no longer supported. Hence the endpoint no longer exists
+ @Ignore
+ @Test
+ public void simpleBusdoxDocIdQnsScheme() throws Exception {
+ Endpoint endpoint = lookupService.lookup(Header.newInstance()
+ .receiver(ParticipantIdentifier.of("0208:0871221633"))
+ .documentType(DocumentTypeIdentifier.of("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1", DocumentTypeIdentifier.BUSDOX_DOCID_QNS_SCHEME))
+ .process(ProcessIdentifier.of("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")));
+
+ Assert.assertNotNull(endpoint);
+ }
+
+ @Test(expectedExceptions = OxalisTransmissionException.class)
+ public void triggerException() throws Exception {
+ lookupService.lookup(Header.newInstance()
+ .receiver(ParticipantIdentifier.of("9908:---"))
+ .documentType(DocumentTypeIdentifier.of("urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:www.cenbii.eu:transaction:biitrns010:ver2.0:extended:urn:www.peppol.eu:bis:peppol4a:ver2.0::2.1"))
+ .process(ProcessIdentifier.of("urn:www.cenbii.eu:profile:bii04:ver2.0")));
+ }
+}
diff --git a/oxalis-outbound/src/test/java/network/oxalis/outbound/lookup/LookupServiceTest.java b/oxalis-outbound/src/test/java/network/oxalis/outbound/lookup/LookupServiceTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..f09ecd25de06b033709942946f9bca32810d5860
--- /dev/null
+++ b/oxalis-outbound/src/test/java/network/oxalis/outbound/lookup/LookupServiceTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.lookup;
+
+import com.google.inject.Inject;
+import network.oxalis.api.lookup.LookupService;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import network.oxalis.vefa.peppol.common.model.*;
+import org.testng.Assert;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Ignore;
+import org.testng.annotations.Test;
+
+@Guice(modules = GuiceModuleLoader.class)
+public class LookupServiceTest {
+
+ @Inject
+ private LookupService lookupService;
+
+ // This test is ignored due to UAN-318 - Fjern AS2 protokollen fra Oxalis AP. AS2 no longer supported. Hence the endpoint no longer exists
+ @Ignore
+ @Test
+ public void simple() throws Exception {
+ Endpoint endpoint = lookupService.lookup(Header.newInstance()
+ .receiver(ParticipantIdentifier.of("0208:0871221633"))
+ .documentType(DocumentTypeIdentifier.of(
+ "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##" +
+ "urn:cen.eu:en16931:2017#compliant#" +
+ "urn:fdc:peppol.eu:2017:poacc:billing:3.0" +
+ "::2.1"))
+ .process(ProcessIdentifier.of("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")));
+
+ Assert.assertNotNull(endpoint);
+ }
+
+ // This test is ignored due to UAN-318 - Fjern AS2 protokollen fra Oxalis AP. AS2 no longer supported. Hence the endpoint no longer exists
+ @Ignore
+ @Test
+ public void simpleBusdoxDocIdQnsScheme() throws Exception {
+ Endpoint endpoint = lookupService.lookup(Header.newInstance()
+ .receiver(ParticipantIdentifier.of("0208:0871221633"))
+ .documentType(DocumentTypeIdentifier.of(
+ "urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##" +
+ "urn:cen.eu:en16931:2017#compliant#" +
+ "urn:fdc:peppol.eu:2017:poacc:billing:3.0" +
+ "::2.1", DocumentTypeIdentifier.BUSDOX_DOCID_QNS_SCHEME))
+ .process(ProcessIdentifier.of("urn:fdc:peppol.eu:2017:poacc:billing:01:1.0")));
+
+ Assert.assertNotNull(endpoint);
+ }
+
+}
diff --git a/oxalis-outbound/src/test/java/network/oxalis/outbound/transmission/DefaultTransmissionServiceTest.java b/oxalis-outbound/src/test/java/network/oxalis/outbound/transmission/DefaultTransmissionServiceTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..8a4a390c07ad22abd7a6e3c6cf0d57857b951858
--- /dev/null
+++ b/oxalis-outbound/src/test/java/network/oxalis/outbound/transmission/DefaultTransmissionServiceTest.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.transmission;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.util.Modules;
+import io.opentracing.Span;
+import network.oxalis.api.lang.OxalisTransmissionException;
+import network.oxalis.api.lookup.LookupService;
+import network.oxalis.api.outbound.TransmissionResponse;
+import network.oxalis.api.outbound.TransmissionService;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import network.oxalis.test.asd.AsdTransmissionResponse;
+import network.oxalis.test.lookup.MockLookupModule;
+import network.oxalis.vefa.peppol.common.model.Header;
+import network.oxalis.vefa.peppol.common.model.TransportProfile;
+import org.mockito.Mockito;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import java.net.SocketTimeoutException;
+
+public class DefaultTransmissionServiceTest {
+
+ private Injector injector = Guice.createInjector(
+ Modules.override(new GuiceModuleLoader()).with(new MockLookupModule()));
+
+ private LookupService lookupService;
+
+ private TransmissionService transmissionService;
+
+ @BeforeClass
+ public void beforeClass() {
+ lookupService = injector.getInstance(LookupService.class);
+ transmissionService = injector.getInstance(TransmissionService.class);
+ }
+
+ @Test
+ public void simple() throws Exception {
+ MockLookupModule.resetService();
+
+ TransmissionResponse transmissionResponse = transmissionService.send(getClass().getResourceAsStream("/peppol-bis-invoice-sbdh.xml"));
+
+ Assert.assertTrue(transmissionResponse instanceof AsdTransmissionResponse);
+ Assert.assertEquals(transmissionResponse.getProtocol(), TransportProfile.of("bdx-transport-asd"));
+
+ Assert.assertNotNull(transmissionResponse.getHeader());
+ Assert.assertNotNull(transmissionResponse.getProtocol());
+ }
+
+ @Test(expectedExceptions = OxalisTransmissionException.class, enabled = false)
+ public void simpleTriggerException() throws Exception {
+ Mockito.reset(lookupService);
+ Mockito.when(lookupService.lookup(Mockito.any(Header.class), Mockito.any(Span.class)))
+ .thenThrow(new OxalisTransmissionException("From unit test."));
+
+ transmissionService.send(getClass().getResourceAsStream("/ehf-bii05-t10-valid-invoice.xml"));
+ }
+
+ @Test(expectedExceptions = SocketTimeoutException.class, enabled = false)
+ public void socketTimeoutException() throws Exception {
+ MockLookupModule.resetService();
+
+ TransmissionResponse transmissionResponse = transmissionService.send(getClass().getResourceAsStream("/ehf-bii05-t10-valid-invoice.xml"));
+
+ Assert.assertTrue(transmissionResponse instanceof AsdTransmissionResponse);
+ Assert.assertEquals(transmissionResponse.getProtocol(), TransportProfile.of("bdx-transport-asd"));
+
+ Assert.assertNotNull(transmissionResponse.getHeader());
+ Assert.assertNotNull(transmissionResponse.getProtocol());
+ }
+}
diff --git a/oxalis-outbound/src/test/java/network/oxalis/outbound/transmission/DefaultTransmitterTest.java b/oxalis-outbound/src/test/java/network/oxalis/outbound/transmission/DefaultTransmitterTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..eca715d6223b66adff62cfb12e7604c4d651854f
--- /dev/null
+++ b/oxalis-outbound/src/test/java/network/oxalis/outbound/transmission/DefaultTransmitterTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.transmission;
+
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+import io.opentracing.Tracer;
+import network.oxalis.api.lang.OxalisTransmissionException;
+import network.oxalis.api.lookup.LookupService;
+import network.oxalis.api.outbound.TransmissionRequest;
+import network.oxalis.api.outbound.Transmitter;
+import network.oxalis.api.statistics.StatisticsService;
+import network.oxalis.commons.error.SilentErrorTracker;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import network.oxalis.commons.mode.OxalisCertificateValidator;
+import network.oxalis.commons.transmission.DefaultTransmissionVerifier;
+import network.oxalis.vefa.peppol.common.model.Endpoint;
+import network.oxalis.vefa.peppol.common.model.TransportProfile;
+import network.oxalis.vefa.peppol.security.api.CertificateValidator;
+import org.mockito.Mockito;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayInputStream;
+import java.net.URI;
+
+@Guice(modules = GuiceModuleLoader.class)
+public class DefaultTransmitterTest {
+
+ @Inject
+ private MessageSenderFactory messageSenderFactory;
+
+ @Inject
+ @Named("noop")
+ private StatisticsService statisticsService;
+
+ @Inject
+ private Tracer tracer;
+
+ @Inject
+ private LookupService lookupService;
+
+ @Test(expectedExceptions = OxalisTransmissionException.class)
+ public void simple() throws Exception {
+ TransmissionRequest transmissionRequest = Mockito.mock(TransmissionRequest.class);
+ Mockito.when(transmissionRequest.getEndpoint()).thenReturn(Endpoint.of(
+ TransportProfile.of("busdox-transport-dummy"), URI.create("http://localhost/"), null));
+ Mockito.when(transmissionRequest.getPayload())
+ .thenReturn(new ByteArrayInputStream("".getBytes()));
+
+ Transmitter transmitter = new DefaultTransmitter(messageSenderFactory, statisticsService,
+ new DefaultTransmissionVerifier(), lookupService, tracer,
+ new OxalisCertificateValidator(CertificateValidator.EMPTY, tracer),
+ new SilentErrorTracker());
+ transmitter.transmit(transmissionRequest);
+ }
+
+ @Test(expectedExceptions = OxalisTransmissionException.class)
+ public void throwException() throws Exception {
+ MessageSenderFactory messageSenderFactory = Mockito.mock(MessageSenderFactory.class);
+ Mockito.when(messageSenderFactory.getMessageSender(Mockito.any(TransportProfile.class)))
+ .thenThrow(new OxalisTransmissionException("From unit test"));
+
+ TransmissionRequest transmissionRequest = Mockito.mock(TransmissionRequest.class);
+ Mockito.when(transmissionRequest.getEndpoint())
+ .thenReturn(Endpoint.of(TransportProfile.AS2_1_0, URI.create("http://localhost/"), null));
+
+ Transmitter transmitter = new DefaultTransmitter(messageSenderFactory, statisticsService,
+ new DefaultTransmissionVerifier(), lookupService, tracer,
+ new OxalisCertificateValidator(CertificateValidator.EMPTY, tracer),
+ new SilentErrorTracker());
+ transmitter.transmit(transmissionRequest);
+ }
+}
diff --git a/oxalis-outbound/src/test/java/network/oxalis/outbound/transmission/MessageSenderFactoryTest.java b/oxalis-outbound/src/test/java/network/oxalis/outbound/transmission/MessageSenderFactoryTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..35b24ec6f1d61a61548a55dffe3d82cfb833ebc8
--- /dev/null
+++ b/oxalis-outbound/src/test/java/network/oxalis/outbound/transmission/MessageSenderFactoryTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.transmission;
+
+import com.google.inject.Inject;
+import network.oxalis.api.lang.OxalisTransmissionException;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import network.oxalis.test.asd.AsdConstants;
+import network.oxalis.vefa.peppol.common.model.TransportProfile;
+import org.testng.Assert;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import java.util.List;
+
+@Guice(modules = GuiceModuleLoader.class)
+public class MessageSenderFactoryTest {
+
+ @Inject
+ private MessageSenderFactory messageSenderFactory;
+
+ @Test
+ public void simple() throws OxalisTransmissionException {
+ Assert.assertTrue(messageSenderFactory.getPrioritizedTransportProfiles().size() > 0);
+ Assert.assertEquals(messageSenderFactory.getSender(TransportProfile.of("bdx-transport-asd")), "oxalis-asd");
+ }
+
+ @Test
+ public void validTransportProfile() throws OxalisTransmissionException {
+ Assert.assertNotNull(messageSenderFactory.getMessageSender(AsdConstants.TRANSPORT_PROFILE));
+ }
+
+ @Test(expectedExceptions = OxalisTransmissionException.class)
+ public void invalidTransportProfile() throws OxalisTransmissionException {
+ messageSenderFactory.getMessageSender(TransportProfile.START);
+ }
+
+ @Test
+ public void canDisableTransportProfileByMode() {
+ List transportProfileList = messageSenderFactory.getPrioritizedTransportProfiles();
+ Assert.assertNotNull(transportProfileList);
+ Assert.assertFalse(transportProfileList.stream().anyMatch(t -> t.getIdentifier().equals("foo-mode-transport")), "should not contain transport which is only enabled in other modes");
+ }
+
+ @Test
+ public void canEnableTransportProfileByMode() {
+ List transportProfileList = messageSenderFactory.getPrioritizedTransportProfiles();
+ Assert.assertNotNull(transportProfileList);
+ Assert.assertTrue(transportProfileList.stream().anyMatch(t -> t.getIdentifier().equals("dummy-mode-transport")), "should contain transport which is only enabled in DUMMY mode");
+ }
+}
diff --git a/oxalis-outbound/src/test/java/network/oxalis/outbound/transmission/TransmissionRequestBuilderTest.java b/oxalis-outbound/src/test/java/network/oxalis/outbound/transmission/TransmissionRequestBuilderTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..8b20fb9b301e9432ecd2f23e4a35c3baa5afd2c6
--- /dev/null
+++ b/oxalis-outbound/src/test/java/network/oxalis/outbound/transmission/TransmissionRequestBuilderTest.java
@@ -0,0 +1,261 @@
+/*
+ * Copyright 2010-2018 Norwegian Agency for Public Management and eGovernment (Difi)
+ *
+ * Licensed under the EUPL, Version 1.1 or – as soon they
+ * will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ *
+ * You may not use this work except in compliance with the Licence.
+ *
+ * You may obtain a copy of the Licence at:
+ *
+ * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+ *
+ * Unless required by applicable law or agreed to in
+ * writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the Licence for the specific language governing
+ * permissions and limitations under the Licence.
+ */
+
+package network.oxalis.outbound.transmission;
+
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+import network.oxalis.test.identifier.PeppolDocumentTypeIdAcronym;
+import network.oxalis.test.identifier.PeppolProcessTypeIdAcronym;
+import network.oxalis.test.identifier.WellKnownParticipant;
+import network.oxalis.api.lang.OxalisException;
+import network.oxalis.api.model.TransmissionIdentifier;
+import network.oxalis.api.outbound.TransmissionRequest;
+import network.oxalis.commons.guice.GuiceModuleLoader;
+import network.oxalis.sniffer.PeppolStandardBusinessHeader;
+import network.oxalis.sniffer.identifier.ParticipantId;
+import network.oxalis.test.lookup.MockLookupModule;
+import network.oxalis.vefa.peppol.common.model.Endpoint;
+import network.oxalis.vefa.peppol.common.model.Header;
+import network.oxalis.vefa.peppol.common.model.ParticipantIdentifier;
+import network.oxalis.vefa.peppol.common.model.TransportProfile;
+import org.testng.annotations.*;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.security.cert.X509Certificate;
+import java.util.Map;
+
+import static org.testng.Assert.*;
+
+/**
+ * These tests needs TransmissionRequestBuilder to run in TEST-mode to be able to override values
+ *
+ * @author steinar
+ * @author thore
+ */
+@Guice(modules = GuiceModuleLoader.class)
+public class TransmissionRequestBuilderTest {
+
+ @Inject
+ @Named("test-files-with-identification")
+ public Map