honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup for #254

This commit is contained in:
James Agnew 2015-11-15 12:52:46 -05:00
parent c516050716
commit 8c087f053a
2 changed files with 49 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaConformanceProviderDstu1.java
View File

@ -41,14 +41,27 @@ import ca.uhn.fhir.model.primitive.DecimalDt;
import ca.uhn.fhir.rest.server.RestfulServer; import ca.uhn.fhir.rest.server.RestfulServer;
import ca.uhn.fhir.rest.server.provider.ServerConformanceProvider; import ca.uhn.fhir.rest.server.provider.ServerConformanceProvider;
import ca.uhn.fhir.util.ExtensionConstants; import ca.uhn.fhir.util.ExtensionConstants;
import net.sourceforge.cobertura.CoverageIgnore;
public class JpaConformanceProviderDstu1 extends ServerConformanceProvider { public class JpaConformanceProviderDstu1 extends ServerConformanceProvider {
private String myImplementationDescription;
private IFhirSystemDao<List<IResource>> mySystemDao;
private volatile Conformance myCachedValue; private volatile Conformance myCachedValue;
private String myImplementationDescription;
private RestfulServer myRestfulServer; private RestfulServer myRestfulServer;
private IFhirSystemDao<List<IResource>> mySystemDao;
/**
* Constructor
*/
@CoverageIgnore
public JpaConformanceProviderDstu1(){
super();
super.setCache(false);
}
/**
* Constructor
*/
public JpaConformanceProviderDstu1(RestfulServer theRestfulServer, IFhirSystemDao<List<IResource>> theSystemDao) { public JpaConformanceProviderDstu1(RestfulServer theRestfulServer, IFhirSystemDao<List<IResource>> theSystemDao) {
super(theRestfulServer); super(theRestfulServer);
myRestfulServer = theRestfulServer; myRestfulServer = theRestfulServer;
@ -56,11 +69,6 @@ public class JpaConformanceProviderDstu1 extends ServerConformanceProvider {
super.setCache(false); super.setCache(false);
} }
public JpaConformanceProviderDstu1(){
super();
super.setCache(false);
}
@Override @Override
public Conformance getServerConformance(HttpServletRequest theRequest) { public Conformance getServerConformance(HttpServletRequest theRequest) {
Conformance retVal = myCachedValue; Conformance retVal = myCachedValue;
@ -100,18 +108,20 @@ public class JpaConformanceProviderDstu1 extends ServerConformanceProvider {
return retVal; return retVal;
} }
@CoverageIgnore
public void setImplementationDescription(String theImplDesc) {
myImplementationDescription = theImplDesc;
}
@Override @Override
public void setRestfulServer(RestfulServer theRestfulServer) { public void setRestfulServer(RestfulServer theRestfulServer) {
this.myRestfulServer = theRestfulServer; this.myRestfulServer = theRestfulServer;
super.setRestfulServer(theRestfulServer); super.setRestfulServer(theRestfulServer);
} }
public void setMySystemDao(IFhirSystemDao<List<IResource>> mySystemDao) { @CoverageIgnore
public void setSystemDao(IFhirSystemDao<List<IResource>> mySystemDao) {
this.mySystemDao = mySystemDao; this.mySystemDao = mySystemDao;
} }
public void setImplementationDescription(String theImplDesc) {
myImplementationDescription = theImplDesc;
}
} }

44
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaConformanceProviderDstu2.java
View File

@ -43,15 +43,28 @@ import ca.uhn.fhir.model.primitive.DecimalDt;
import ca.uhn.fhir.rest.server.RestfulServer; import ca.uhn.fhir.rest.server.RestfulServer;
import ca.uhn.fhir.rest.server.provider.dstu2.ServerConformanceProvider; import ca.uhn.fhir.rest.server.provider.dstu2.ServerConformanceProvider;
import ca.uhn.fhir.util.ExtensionConstants; import ca.uhn.fhir.util.ExtensionConstants;
import net.sourceforge.cobertura.CoverageIgnore;
public class JpaConformanceProviderDstu2 extends ServerConformanceProvider { public class JpaConformanceProviderDstu2 extends ServerConformanceProvider {
private String myImplementationDescription;
private IFhirSystemDao<Bundle> mySystemDao;
private volatile Conformance myCachedValue; private volatile Conformance myCachedValue;
private RestfulServer myRestfulServer;
private DaoConfig myDaoConfig; private DaoConfig myDaoConfig;
private String myImplementationDescription;
private RestfulServer myRestfulServer;
private IFhirSystemDao<Bundle> mySystemDao;
/**
* Constructor
*/
@CoverageIgnore
public JpaConformanceProviderDstu2(){
super();
super.setCache(false);
}
/**
* Constructor
*/
public JpaConformanceProviderDstu2(RestfulServer theRestfulServer, IFhirSystemDao<Bundle> theSystemDao, DaoConfig theDaoConfig) { public JpaConformanceProviderDstu2(RestfulServer theRestfulServer, IFhirSystemDao<Bundle> theSystemDao, DaoConfig theDaoConfig) {
super(theRestfulServer); super(theRestfulServer);
myRestfulServer = theRestfulServer; myRestfulServer = theRestfulServer;
@ -60,11 +73,6 @@ public class JpaConformanceProviderDstu2 extends ServerConformanceProvider {
super.setCache(false); super.setCache(false);
} }
public JpaConformanceProviderDstu2(){
super();
super.setCache(false);
}
@Override @Override
public Conformance getServerConformance(HttpServletRequest theRequest) { public Conformance getServerConformance(HttpServletRequest theRequest) {
Conformance retVal = myCachedValue; Conformance retVal = myCachedValue;
@ -110,21 +118,23 @@ public class JpaConformanceProviderDstu2 extends ServerConformanceProvider {
return retVal; return retVal;
} }
public void setDaoConfig(DaoConfig myDaoConfig) {
this.myDaoConfig = myDaoConfig;
}
@CoverageIgnore
public void setImplementationDescription(String theImplDesc) {
myImplementationDescription = theImplDesc;
}
@Override @Override
public void setRestfulServer(RestfulServer theRestfulServer) { public void setRestfulServer(RestfulServer theRestfulServer) {
this.myRestfulServer = theRestfulServer; this.myRestfulServer = theRestfulServer;
super.setRestfulServer(theRestfulServer); super.setRestfulServer(theRestfulServer);
} }
public void setMyDaoConfig(DaoConfig myDaoConfig) { @CoverageIgnore
this.myDaoConfig = myDaoConfig; public void setSystemDao(IFhirSystemDao<Bundle> mySystemDao) {
}
public void setMySystemDao(IFhirSystemDao<Bundle> mySystemDao) {
this.mySystemDao = mySystemDao; this.mySystemDao = mySystemDao;
} }
public void setImplementationDescription(String theImplDesc) {
myImplementationDescription = theImplDesc;
}
} }