diff --git a/common/common/pom.xml b/common/common/pom.xml
index 61f9de82..d77ed5b0 100644
--- a/common/common/pom.xml
+++ b/common/common/pom.xml
@@ -17,6 +17,7 @@
org.hibernate.javax.persistence
hibernate-jpa-2.0-api
1.0.0.Final
+ provided
diff --git a/common/common/src/main/java/com/trifork/stamdata/models/cpr/BarnRelation.java b/common/common/src/main/java/com/trifork/stamdata/models/cpr/BarnRelation.java
deleted file mode 100644
index 688e25af..00000000
--- a/common/common/src/main/java/com/trifork/stamdata/models/cpr/BarnRelation.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Contributor(s): Contributors are attributed in the source code
- * where applicable.
- *
- * The Original Code is "Stamdata".
- *
- * The Initial Developer of the Original Code is Trifork Public A/S.
- *
- * Portions created for the Original Code are Copyright 2011,
- * Lægemiddelstyrelsen. All Rights Reserved.
- *
- * Portions created for the FMKi Project are Copyright 2011,
- * National Board of e-Health (NSI). All Rights Reserved.
- */
-
-
-package com.trifork.stamdata.models.cpr;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-import com.trifork.stamdata.models.BaseTemporalEntity;
-
-
-@Entity
-public class BarnRelation extends BaseTemporalEntity
-{
- private String cpr;
- private String barnCpr;
- private String id;
-
- @Id
- @Column
- public String getId()
- {
- return id;
- }
-
- // TODO: The ID Column is constructed by the data manager's entity class.
- // Actual construction of the id should be moved to the CPR parser.
- public void setId(String id)
- {
- this.id = id;
- }
-
- @Column
- public String getCpr()
- {
- return cpr;
- }
-
- public void setCpr(String cpr)
- {
- this.cpr = cpr;
- }
-
- @Column
- public String getBarnCpr()
- {
- return barnCpr;
- }
-
- public void setBarnCpr(String barnCpr)
- {
- this.barnCpr = barnCpr;
- }
-}
diff --git a/common/common/src/main/java/com/trifork/stamdata/models/cpr/ForaeldreMyndighedRelation.java b/common/common/src/main/java/com/trifork/stamdata/models/cpr/ForaeldreMyndighedRelation.java
deleted file mode 100644
index b08604cc..00000000
--- a/common/common/src/main/java/com/trifork/stamdata/models/cpr/ForaeldreMyndighedRelation.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Contributor(s): Contributors are attributed in the source code
- * where applicable.
- *
- * The Original Code is "Stamdata".
- *
- * The Initial Developer of the Original Code is Trifork Public A/S.
- *
- * Portions created for the Original Code are Copyright 2011,
- * Lægemiddelstyrelsen. All Rights Reserved.
- *
- * Portions created for the FMKi Project are Copyright 2011,
- * National Board of e-Health (NSI). All Rights Reserved.
- */
-
-package com.trifork.stamdata.models.cpr;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-import com.trifork.stamdata.models.BaseTemporalEntity;
-
-
-@Entity
-public class ForaeldreMyndighedRelation extends BaseTemporalEntity
-{
- private String id;
- private String cpr;
- private String typeKode;
- private String typeTekst;
- private String relationCpr; // This is included if the guardian is not the
- // mother or farther.
-
-
- @Id
- @Column
- public String getId()
- {
- return id;
- }
-
-
- public void setId(String id)
- {
- this.id = id;
- }
-
-
- @Column
- public String getCpr()
- {
- return cpr;
- }
-
-
- public void setCpr(String cpr)
- {
- this.cpr = cpr;
- }
-
-
- @Column
- public String getTypeTekst()
- {
- return typeTekst;
- }
-
-
- @Column
- public String getTypeKode()
- {
- return typeKode;
- }
-
-
- public void setType(String type)
- {
- this.typeKode = type;
- }
-
-
- @Column
- public String getRelationCpr()
- {
- return relationCpr;
- }
-
-
- public void setRelationCpr(String relationCpr)
- {
- this.relationCpr = relationCpr;
- }
-}
diff --git a/common/common/src/main/java/com/trifork/stamdata/models/sikrede/Sikrede.java b/common/common/src/main/java/com/trifork/stamdata/models/sikrede/Sikrede.java
deleted file mode 100644
index 74846fab..00000000
--- a/common/common/src/main/java/com/trifork/stamdata/models/sikrede/Sikrede.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * Contributor(s): Contributors are attributed in the source code
- * where applicable.
- *
- * The Original Code is "Stamdata".
- *
- * The Initial Developer of the Original Code is Trifork Public A/S.
- *
- * Portions created for the Original Code are Copyright 2011,
- * Lægemiddelstyrelsen. All Rights Reserved.
- *
- * Portions created for the FMKi Project are Copyright 2011,
- * National Board of e-Health (NSI). All Rights Reserved.
- */
-package com.trifork.stamdata.models.sikrede;
-
-import javax.persistence.Entity;
-
-@Entity
-public class Sikrede
-{
- // TODO: Implement this or move the implementation from the data manager and make it work with the CPR service.
-}
diff --git a/common/dgws-filter/src/main/java/dk/nsi/dgws/DgwsIdcardFilter.java b/common/dgws-filter/src/main/java/dk/nsi/dgws/DgwsIdcardFilter.java
index 65345432..4ab2932f 100644
--- a/common/dgws-filter/src/main/java/dk/nsi/dgws/DgwsIdcardFilter.java
+++ b/common/dgws-filter/src/main/java/dk/nsi/dgws/DgwsIdcardFilter.java
@@ -24,6 +24,10 @@
*/
package dk.nsi.dgws;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import dk.sosi.seal.SOSIFactory;
import dk.sosi.seal.model.IDCard;
import dk.sosi.seal.model.Reply;
@@ -49,6 +53,7 @@
import java.io.IOException;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
import java.util.Properties;
@@ -198,6 +203,7 @@ public void destroy() { }
* This annotation allows dependency injectors know
* that the annotated element can be null.
*/
- @Retention(RetentionPolicy.RUNTIME)
+ @Retention(RUNTIME)
+ @Target({ FIELD, PARAMETER, METHOD })
public @interface Nullable { }
}
diff --git a/nsp/cpr-ws/pom.xml b/nsp/cpr-ws/pom.xml
index 7be09419..bd2cd58c 100644
--- a/nsp/cpr-ws/pom.xml
+++ b/nsp/cpr-ws/pom.xml
@@ -76,6 +76,7 @@
xerces
xercesImpl
2.8.0
+ provided
@@ -138,7 +139,11 @@
dk.nsi.stamdata
stamdata-testing
${project.version}
+
diff --git a/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/HibernatePersistenceFilter.java b/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/HibernatePersistenceFilter.java
index 68c2e968..51f02c31 100644
--- a/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/HibernatePersistenceFilter.java
+++ b/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/HibernatePersistenceFilter.java
@@ -40,10 +40,11 @@
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.Configuration;
+import org.hibernate.metadata.ClassMetadata;
-import com.trifork.stamdata.models.cpr.Person;
-import com.trifork.stamdata.models.sikrede.SikredeYderRelation;
-import com.trifork.stamdata.models.sikrede.Yderregister;
+import dk.nsi.stamdata.cpr.models.Person;
+import dk.nsi.stamdata.cpr.models.SikredeYderRelation;
+import dk.nsi.stamdata.cpr.models.Yderregister;
@Singleton
public class HibernatePersistenceFilter implements Provider, Filter
@@ -66,6 +67,7 @@ public class HibernatePersistenceFilter implements Provider, Filter
config.setProperty("hibernate.connection.url", jdbcURL);
config.setProperty("hibernate.connection.username", username);
config.setProperty("hibernate.connection.password", password);
+ config.setProperty("hibernate.archive.autodetection", "class, hbm");
config.setProperty("hibernate.connection.driver_class", "com.mysql.jdbc.Driver");
config.setProperty("hibernate.dialect", "org.hibernate.dialect.MySQLInnoDBDialect");
@@ -90,7 +92,14 @@ public class HibernatePersistenceFilter implements Provider, Filter
config.addAnnotatedClass(SikredeYderRelation.class);
sessionFactory = config.buildSessionFactory();
- sessionFactory.openSession().isConnected();
+ Session session = sessionFactory.openSession();
+
+ System.out.println("Listing mapped classes:");
+
+ for (ClassMetadata meta : sessionFactory.getAllClassMetadata().values())
+ {
+ System.out.println("MAPPED CLASS: " + meta.getEntityName());
+ }
}
diff --git a/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/PersonMapper.java b/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/PersonMapper.java
index 4b2c6216..d5af2750 100644
--- a/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/PersonMapper.java
+++ b/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/PersonMapper.java
@@ -28,11 +28,11 @@
import com.google.inject.servlet.RequestScoped;
import com.trifork.stamdata.Nullable;
import com.trifork.stamdata.Preconditions;
-import com.trifork.stamdata.models.cpr.Person;
-import com.trifork.stamdata.models.sikrede.SikredeYderRelation;
-import com.trifork.stamdata.models.sikrede.Yderregister;
import dk.nsi.stamdata.cpr.mapping.CivilRegistrationStatusCodes;
import dk.nsi.stamdata.cpr.mapping.MunicipalityMapper;
+import dk.nsi.stamdata.cpr.models.Person;
+import dk.nsi.stamdata.cpr.models.SikredeYderRelation;
+import dk.nsi.stamdata.cpr.models.Yderregister;
import dk.nsi.stamdata.cpr.pvit.WhitelistProvider.Whitelist;
import dk.nsi.stamdata.cpr.ws.*;
import dk.sosi.seal.model.SystemIDCard;
diff --git a/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/medcom/DetGodeCPROpslagImpl.java b/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/medcom/DetGodeCPROpslagImpl.java
index f90eb83e..d37c1f0e 100644
--- a/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/medcom/DetGodeCPROpslagImpl.java
+++ b/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/medcom/DetGodeCPROpslagImpl.java
@@ -24,30 +24,40 @@
*/
package dk.nsi.stamdata.cpr.medcom;
+import static com.trifork.stamdata.Preconditions.checkNotNull;
+
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.ws.Holder;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.google.inject.Inject;
import com.sun.xml.ws.developer.SchemaValidation;
import com.trifork.stamdata.Fetcher;
import com.trifork.stamdata.Nullable;
-import com.trifork.stamdata.models.cpr.Person;
-import com.trifork.stamdata.models.sikrede.Sikrede;
-import com.trifork.stamdata.models.sikrede.SikredeYderRelation;
-import com.trifork.stamdata.models.sikrede.Yderregister;
+
import dk.nsi.stamdata.cpr.PersonMapper;
import dk.nsi.stamdata.cpr.PersonMapper.ServiceProtectionLevel;
import dk.nsi.stamdata.cpr.SoapUtils;
import dk.nsi.stamdata.cpr.jaxws.GuiceInstanceResolver.GuiceWebservice;
-import dk.nsi.stamdata.cpr.ws.*;
+import dk.nsi.stamdata.cpr.models.Person;
+import dk.nsi.stamdata.cpr.models.SikredeYderRelation;
+import dk.nsi.stamdata.cpr.models.Yderregister;
+import dk.nsi.stamdata.cpr.ws.DGWSFault;
+import dk.nsi.stamdata.cpr.ws.DetGodeCPROpslag;
+import dk.nsi.stamdata.cpr.ws.GetPersonInformationIn;
+import dk.nsi.stamdata.cpr.ws.GetPersonInformationOut;
+import dk.nsi.stamdata.cpr.ws.GetPersonWithHealthCareInformationIn;
+import dk.nsi.stamdata.cpr.ws.GetPersonWithHealthCareInformationOut;
+import dk.nsi.stamdata.cpr.ws.Header;
+import dk.nsi.stamdata.cpr.ws.PersonInformationStructureType;
+import dk.nsi.stamdata.cpr.ws.PersonWithHealthCareInformationStructureType;
+import dk.nsi.stamdata.cpr.ws.Security;
import dk.sosi.seal.model.SystemIDCard;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.ws.Holder;
-
-import static com.trifork.stamdata.Preconditions.checkNotNull;
@SchemaValidation
@@ -223,31 +233,6 @@ private Yderregister fetchYderregisterForPnr(int ydernummer)
}
- @SuppressWarnings("unused")
- private Sikrede fetchSikredeWithPnr(String cpr)
- {
- checkNotNull(cpr, "cpr");
-
- Sikrede sikrede = null;
-
- try
- {
- // sikrede = fetcher.fetch(Sikrede.class, pnr); //TODO
- }
- catch (Exception e)
- {
- throw SoapUtils.newServerErrorFault(e);
- }
-
- if (sikrede == null)
- {
- throw SoapUtils.newSOAPSenderFault(FaultMessages.NO_DATA_FOUND_FAULT_MSG);
- }
-
- return sikrede;
- }
-
-
private void checkInputParameters(@Nullable String pnr)
{
if (StringUtils.isBlank(pnr))
diff --git a/common/common/src/main/java/com/trifork/stamdata/models/cpr/Person.java b/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/models/Person.java
similarity index 98%
rename from common/common/src/main/java/com/trifork/stamdata/models/cpr/Person.java
rename to nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/models/Person.java
index 2196f0bc..48ed72e7 100644
--- a/common/common/src/main/java/com/trifork/stamdata/models/cpr/Person.java
+++ b/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/models/Person.java
@@ -22,21 +22,20 @@
* Portions created for the FMKi Project are Copyright 2011,
* National Board of e-Health (NSI). All Rights Reserved.
*/
-package com.trifork.stamdata.models.cpr;
+package dk.nsi.stamdata.cpr.models;
-import com.trifork.stamdata.Nullable;
-import com.trifork.stamdata.models.BaseTemporalEntity;
+import static javax.persistence.TemporalType.DATE;
+import static javax.persistence.TemporalType.TIMESTAMP;
+
+import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Temporal;
-import java.text.DecimalFormat;
-import java.util.Date;
-
-import static javax.persistence.TemporalType.DATE;
-import static javax.persistence.TemporalType.TIMESTAMP;
+import com.trifork.stamdata.Nullable;
+import com.trifork.stamdata.models.BaseTemporalEntity;
// Use the split of different parts that the person table is made up of instead.
// The person table is unstable and its behavior is not well-defined.
diff --git a/common/common/src/main/java/com/trifork/stamdata/models/sikrede/SikredeYderRelation.java b/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/models/SikredeYderRelation.java
similarity index 98%
rename from common/common/src/main/java/com/trifork/stamdata/models/sikrede/SikredeYderRelation.java
rename to nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/models/SikredeYderRelation.java
index 00970fc8..c60fb45c 100644
--- a/common/common/src/main/java/com/trifork/stamdata/models/sikrede/SikredeYderRelation.java
+++ b/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/models/SikredeYderRelation.java
@@ -22,7 +22,7 @@
* Portions created for the FMKi Project are Copyright 2011,
* National Board of e-Health (NSI). All Rights Reserved.
*/
-package com.trifork.stamdata.models.sikrede;
+package dk.nsi.stamdata.cpr.models;
import com.trifork.stamdata.models.BaseTemporalEntity;
diff --git a/common/common/src/main/java/com/trifork/stamdata/models/sikrede/Yderregister.java b/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/models/Yderregister.java
similarity index 98%
rename from common/common/src/main/java/com/trifork/stamdata/models/sikrede/Yderregister.java
rename to nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/models/Yderregister.java
index 3ed93eca..d90671f8 100644
--- a/common/common/src/main/java/com/trifork/stamdata/models/sikrede/Yderregister.java
+++ b/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/models/Yderregister.java
@@ -22,7 +22,7 @@
* Portions created for the FMKi Project are Copyright 2011,
* National Board of e-Health (NSI). All Rights Reserved.
*/
-package com.trifork.stamdata.models.sikrede;
+package dk.nsi.stamdata.cpr.models;
import com.trifork.stamdata.models.BaseTemporalEntity;
diff --git a/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/pvit/StamdataPersonResponseFinder.java b/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/pvit/StamdataPersonResponseFinder.java
index d3080b21..20fea8c4 100644
--- a/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/pvit/StamdataPersonResponseFinder.java
+++ b/nsp/cpr-ws/src/main/java/dk/nsi/stamdata/cpr/pvit/StamdataPersonResponseFinder.java
@@ -26,8 +26,8 @@
import com.google.common.collect.Maps;
import com.trifork.stamdata.Fetcher;
-import com.trifork.stamdata.models.cpr.Person;
import dk.nsi.stamdata.cpr.PersonMapper;
+import dk.nsi.stamdata.cpr.models.Person;
import dk.nsi.stamdata.cpr.ws.NamePersonQueryType;
import dk.nsi.stamdata.cpr.ws.PersonInformationStructureType;
import dk.nsi.stamdata.cpr.ws.PersonLookupResponseType;
diff --git a/nsp/cpr-ws/src/test/java/com/trifork/stamdata/models/sikrede/SikredeYderRelationDaoTest.java b/nsp/cpr-ws/src/test/java/com/trifork/stamdata/models/sikrede/SikredeYderRelationDaoTest.java
index 06a482c2..220396a2 100644
--- a/nsp/cpr-ws/src/test/java/com/trifork/stamdata/models/sikrede/SikredeYderRelationDaoTest.java
+++ b/nsp/cpr-ws/src/test/java/com/trifork/stamdata/models/sikrede/SikredeYderRelationDaoTest.java
@@ -32,6 +32,8 @@
import org.joda.time.DateTime;
import org.junit.Before;
+import dk.nsi.stamdata.cpr.models.SikredeYderRelation;
+
public class SikredeYderRelationDaoTest extends AbstractDaoTest {
@Before
diff --git a/nsp/cpr-ws/src/test/java/com/trifork/stamdata/models/sikrede/YderregisterDaoTest.java b/nsp/cpr-ws/src/test/java/com/trifork/stamdata/models/sikrede/YderregisterDaoTest.java
index 2235bb98..d279a17b 100644
--- a/nsp/cpr-ws/src/test/java/com/trifork/stamdata/models/sikrede/YderregisterDaoTest.java
+++ b/nsp/cpr-ws/src/test/java/com/trifork/stamdata/models/sikrede/YderregisterDaoTest.java
@@ -34,6 +34,8 @@
import org.junit.Before;
import org.junit.Test;
+import dk.nsi.stamdata.cpr.models.Yderregister;
+
public class YderregisterDaoTest extends AbstractDaoTest
{
diff --git a/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/Factories.java b/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/Factories.java
index b845e36d..897e077f 100644
--- a/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/Factories.java
+++ b/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/Factories.java
@@ -24,9 +24,10 @@
*/
package dk.nsi.stamdata.cpr;
-import com.trifork.stamdata.models.cpr.Person;
-import com.trifork.stamdata.models.sikrede.SikredeYderRelation;
-import com.trifork.stamdata.models.sikrede.Yderregister;
+
+import dk.nsi.stamdata.cpr.models.Person;
+import dk.nsi.stamdata.cpr.models.SikredeYderRelation;
+import dk.nsi.stamdata.cpr.models.Yderregister;
import org.joda.time.DateTime;
diff --git a/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/PerformanceTest.java b/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/PerformanceTest.java
index f96b5b9f..3955abd5 100644
--- a/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/PerformanceTest.java
+++ b/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/PerformanceTest.java
@@ -55,7 +55,7 @@ public Arguments getDefaultParameters()
{
Arguments args = new Arguments();
- args.addArgument(ENDPOINT_URL_PARAM, "http://localhost:8100/stamdata-cpr-ws/service/StamdataPersonLookup");
+ args.addArgument(ENDPOINT_URL_PARAM, "http://localhost:80/stamdata-cpr-ws/service/StamdataPersonLookup");
args.addArgument(CLIENT_CVR_PARAM, "12345678");
args.addArgument(REQUESTED_CPR_PARAM, "2905852569");
@@ -75,30 +75,32 @@ public SampleResult runTest(JavaSamplerContext context)
try
{
StamdataPersonLookup client = createClient(endpointURL);
+
SecurityWrapper headers = createHeaders(clientCVR);
-
PersonLookupRequestType query = new PersonLookupRequestType();
query.setCivilRegistrationNumberPersonQuery(requestedCPR);
-
+
// Wait until the last minute before starting the
// timer.
-
+
result.sampleStart();
-
client.getPersonDetails(headers.getSecurity(), headers.getMedcomHeader(), query);
-
result.sampleEnd();
-
+
result.setSuccessful(true);
result.setResponseCodeOK();
+ result.setResponseMessageOK();
}
catch (SOAPFaultException e)
{
- result.setSuccessful(false);
result.sampleEnd();
+ e.printStackTrace();
+ result.setSuccessful(false);
}
catch (Exception e)
{
+ result.sampleEnd();
+ e.printStackTrace();
throw new RuntimeException(e);
}
@@ -112,14 +114,15 @@ private StamdataPersonLookup createClient(String endpointURL) throws MalformedUR
URL wsdlLocation = new URL(endpointURL + "?wsdl");
StamdataPersonLookupService serviceCatalog = new StamdataPersonLookupService(wsdlLocation, PVIT_SERVICE_QNAME);
-
+
// SEAL enforces that the XML prefixes are exactly
// as it creates them. So we have to make sure we
// don't change them.
serviceCatalog.setHandlerResolver(new SealNamespaceResolver());
+ StamdataPersonLookup client = serviceCatalog.getStamdataPersonLookup();
- return serviceCatalog.getStamdataPersonLookup();
+ return client;
}
diff --git a/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/PersonHealthCareInfoMapperTest.java b/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/PersonHealthCareInfoMapperTest.java
index 287551c8..55b737fe 100644
--- a/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/PersonHealthCareInfoMapperTest.java
+++ b/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/PersonHealthCareInfoMapperTest.java
@@ -41,11 +41,11 @@
import org.junit.Test;
import com.google.common.collect.Sets;
-import com.trifork.stamdata.models.cpr.Person;
-import com.trifork.stamdata.models.sikrede.SikredeYderRelation;
-import com.trifork.stamdata.models.sikrede.Yderregister;
import dk.nsi.stamdata.cpr.mapping.MunicipalityMapper;
+import dk.nsi.stamdata.cpr.models.Person;
+import dk.nsi.stamdata.cpr.models.SikredeYderRelation;
+import dk.nsi.stamdata.cpr.models.Yderregister;
import dk.nsi.stamdata.cpr.ws.AssociatedGeneralPractitionerStructureType;
import dk.nsi.stamdata.cpr.ws.PersonPublicHealthInsuranceType;
import dk.nsi.stamdata.cpr.ws.PersonWithHealthCareInformationStructureType;
diff --git a/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/PersonMapperFieldMappingForProtectedPersonTest.java b/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/PersonMapperFieldMappingForProtectedPersonTest.java
index 41dbc740..8ca80fde 100644
--- a/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/PersonMapperFieldMappingForProtectedPersonTest.java
+++ b/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/PersonMapperFieldMappingForProtectedPersonTest.java
@@ -41,11 +41,11 @@
import org.junit.Test;
import com.google.common.collect.Sets;
-import com.trifork.stamdata.models.cpr.Person;
import dk.nsi.stamdata.cpr.PersonMapper.CPRProtectionLevel;
import dk.nsi.stamdata.cpr.PersonMapper.ServiceProtectionLevel;
import dk.nsi.stamdata.cpr.mapping.MunicipalityMapper;
+import dk.nsi.stamdata.cpr.models.Person;
import dk.nsi.stamdata.cpr.ws.PersonGenderCodeType;
import dk.nsi.stamdata.cpr.ws.PersonInformationStructureType;
import dk.nsi.stamdata.testing.MockSecureTokenService;
diff --git a/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/PersonMapperFieldMappingForUnprotectedPersonTest.java b/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/PersonMapperFieldMappingForUnprotectedPersonTest.java
index 1ebdd3a8..5ad4b8bc 100644
--- a/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/PersonMapperFieldMappingForUnprotectedPersonTest.java
+++ b/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/PersonMapperFieldMappingForUnprotectedPersonTest.java
@@ -40,12 +40,12 @@
import org.junit.Test;
import com.google.common.collect.Sets;
-import com.trifork.stamdata.models.cpr.Person;
import dk.nsi.stamdata.cpr.PersonMapper.CPRProtectionLevel;
import dk.nsi.stamdata.cpr.PersonMapper.ServiceProtectionLevel;
import dk.nsi.stamdata.cpr.mapping.CivilRegistrationStatusCodes;
import dk.nsi.stamdata.cpr.mapping.MunicipalityMapper;
+import dk.nsi.stamdata.cpr.models.Person;
import dk.nsi.stamdata.cpr.ws.PersonGenderCodeType;
import dk.nsi.stamdata.cpr.ws.PersonInformationStructureType;
import dk.sosi.seal.model.SystemIDCard;
diff --git a/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/PersonMapperProtectionTest.java b/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/PersonMapperProtectionTest.java
index 6a324576..f4b6c7b8 100644
--- a/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/PersonMapperProtectionTest.java
+++ b/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/PersonMapperProtectionTest.java
@@ -41,12 +41,12 @@
import org.mockito.runners.MockitoJUnitRunner;
import com.google.common.collect.Sets;
-import com.trifork.stamdata.models.cpr.Person;
-import com.trifork.stamdata.models.sikrede.SikredeYderRelation;
-import com.trifork.stamdata.models.sikrede.Yderregister;
import dk.nsi.stamdata.cpr.PersonMapper.CPRProtectionLevel;
import dk.nsi.stamdata.cpr.mapping.MunicipalityMapper;
+import dk.nsi.stamdata.cpr.models.Person;
+import dk.nsi.stamdata.cpr.models.SikredeYderRelation;
+import dk.nsi.stamdata.cpr.models.Yderregister;
import dk.nsi.stamdata.cpr.ws.PersonInformationStructureType;
import dk.nsi.stamdata.cpr.ws.PersonWithHealthCareInformationStructureType;
import dk.nsi.stamdata.testing.MockSecureTokenService;
diff --git a/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/integrationtest/DetGodeCPROpslagIntegrationTest.java b/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/integrationtest/DetGodeCPROpslagIntegrationTest.java
index 4465fc24..db096ed9 100644
--- a/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/integrationtest/DetGodeCPROpslagIntegrationTest.java
+++ b/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/integrationtest/DetGodeCPROpslagIntegrationTest.java
@@ -45,15 +45,15 @@
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Stage;
-import com.trifork.stamdata.models.cpr.Person;
-import com.trifork.stamdata.models.sikrede.SikredeYderRelation;
-import com.trifork.stamdata.models.sikrede.Yderregister;
import dk.nsi.stamdata.cpr.ComponentController.ComponentModule;
import dk.nsi.stamdata.cpr.Factories;
import dk.nsi.stamdata.cpr.integrationtest.dgws.DGWSHeaderUtil;
import dk.nsi.stamdata.cpr.integrationtest.dgws.SecurityWrapper;
import dk.nsi.stamdata.cpr.jaxws.SealNamespaceResolver;
+import dk.nsi.stamdata.cpr.models.Person;
+import dk.nsi.stamdata.cpr.models.SikredeYderRelation;
+import dk.nsi.stamdata.cpr.models.Yderregister;
import dk.nsi.stamdata.cpr.ws.DGWSFault;
import dk.nsi.stamdata.cpr.ws.DetGodeCPROpslag;
import dk.nsi.stamdata.cpr.ws.DetGodeCPROpslagService;
diff --git a/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/integrationtest/dgws/DGWSHeaderUtil.java b/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/integrationtest/dgws/DGWSHeaderUtil.java
index b1c892cb..14589627 100644
--- a/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/integrationtest/dgws/DGWSHeaderUtil.java
+++ b/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/integrationtest/dgws/DGWSHeaderUtil.java
@@ -77,7 +77,7 @@ private static SecurityWrapper getSecurityWrapper(AuthenticationLevel auth, Stri
JAXBContext context = JAXBContext.newInstance(Security.class);
Marshaller marshaller = context.createMarshaller();
marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", new SealNamespacePrefixMapper());
-
+
StringWriter writer = new StringWriter();
marshaller.marshal(security, writer);
@@ -86,7 +86,7 @@ private static SecurityWrapper getSecurityWrapper(AuthenticationLevel auth, Stri
DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
DocumentBuilder builder = domFactory.newDocumentBuilder();
Document doc = builder.parse(IOUtils.toInputStream(writer.toString()));
-
+
SOSIFactory factory = MockSecureTokenService.createFactory();
Request request = getRequest(auth, factory, careProviderId, careProviderName, itSystemName);
@@ -99,7 +99,7 @@ private static SecurityWrapper getSecurityWrapper(AuthenticationLevel auth, Stri
doc.getDocumentElement().appendChild(importNode);
// Unmarshall the new security object including the idCard.
-
+
Unmarshaller unmarshaller = context.createUnmarshaller();
String securityHeaderSerialized = XmlUtil.node2String(doc);
Security securityResult = (Security) unmarshaller.unmarshal(IOUtils.toInputStream(securityHeaderSerialized));
@@ -110,7 +110,7 @@ private static SecurityWrapper getSecurityWrapper(AuthenticationLevel auth, Stri
timeStamp.setCreated(cal);
securityResult.setTimestamp(timeStamp);
SecurityWrapper wrap = new SecurityWrapper(securityResult, getMedComHeader(request.getMessageID()));
-
+
return wrap;
}
diff --git a/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/pvit/StamdataPersonLookupIntegrationTest.java b/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/pvit/StamdataPersonLookupIntegrationTest.java
index ef5f47c8..72767dd3 100644
--- a/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/pvit/StamdataPersonLookupIntegrationTest.java
+++ b/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/pvit/StamdataPersonLookupIntegrationTest.java
@@ -27,13 +27,13 @@
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Stage;
-import com.trifork.stamdata.models.cpr.Person;
import dk.nsi.stamdata.cpr.ComponentController.ComponentModule;
import dk.nsi.stamdata.cpr.Factories;
import dk.nsi.stamdata.cpr.PersonMapper;
import dk.nsi.stamdata.cpr.integrationtest.dgws.DGWSHeaderUtil;
import dk.nsi.stamdata.cpr.integrationtest.dgws.SecurityWrapper;
import dk.nsi.stamdata.cpr.jaxws.SealNamespaceResolver;
+import dk.nsi.stamdata.cpr.models.Person;
import dk.nsi.stamdata.cpr.ws.*;
import org.hibernate.Session;
import org.hisrc.hifaces20.testing.webappenvironment.testing.junit4.AbstractWebAppEnvironmentJUnit4Test;
diff --git a/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/pvit/StamdataPersonLookupWithSubscriptionIntegrationTest.java b/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/pvit/StamdataPersonLookupWithSubscriptionIntegrationTest.java
index 1d5043d3..3f7600d2 100644
--- a/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/pvit/StamdataPersonLookupWithSubscriptionIntegrationTest.java
+++ b/nsp/cpr-ws/src/test/java/dk/nsi/stamdata/cpr/pvit/StamdataPersonLookupWithSubscriptionIntegrationTest.java
@@ -1,5 +1,30 @@
+/**
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * Contributor(s): Contributors are attributed in the source code
+ * where applicable.
+ *
+ * The Original Code is "Stamdata".
+ *
+ * The Initial Developer of the Original Code is Trifork Public A/S.
+ *
+ * Portions created for the Original Code are Copyright 2011,
+ * Lægemiddelstyrelsen. All Rights Reserved.
+ *
+ * Portions created for the FMKi Project are Copyright 2011,
+ * National Board of e-Health (NSI). All Rights Reserved.
+ */
package dk.nsi.stamdata.cpr.pvit;
+import com.google.common.collect.Maps;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Stage;
@@ -9,6 +34,8 @@
import dk.nsi.stamdata.cpr.integrationtest.dgws.DGWSHeaderUtil;
import dk.nsi.stamdata.cpr.integrationtest.dgws.SecurityWrapper;
import dk.nsi.stamdata.cpr.jaxws.SealNamespaceResolver;
+import dk.nsi.stamdata.cpr.pvit.proxy.CprAbbsFacadeStubImplementation;
+import dk.nsi.stamdata.cpr.pvit.proxy.CprAbbsStubJettyServer;
import dk.nsi.stamdata.cpr.ws.*;
import org.hibernate.Session;
import org.hisrc.hifaces20.testing.webappenvironment.testing.junit4.AbstractWebAppEnvironmentJUnit4Test;
@@ -20,9 +47,10 @@
import javax.xml.namespace.QName;
import javax.xml.ws.Holder;
import java.net.URL;
-import java.util.Date;
+import java.util.*;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
public class StamdataPersonLookupWithSubscriptionIntegrationTest extends AbstractWebAppEnvironmentJUnit4Test
@@ -68,8 +96,8 @@ public void setUp() throws Exception
client = serviceCatalog.getStamdataPersonLookupWithSubscription();
SecurityWrapper securityHeaders = DGWSHeaderUtil.getVocesTrustedSecurityWrapper(REQUEST_CVR, "foo", "bar");
- securityHolder = new Holder(securityHeaders.getSecurity());
- medcomHolder = new Holder(securityHeaders.getMedcomHeader());
+ securityHolder = securityHeaders.getSecurity();
+ medcomHolder = securityHeaders.getMedcomHeader();
}
diff --git a/pom.xml b/pom.xml
index 0a47f5d5..e8e53cd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
search_paths
- ${basedir}/target/test-classes;${basedir}/target
+ ${basedir}/target/test-classes;${basedir}/target/classes
java.awt.headless