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

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Simon Janic 2018-01-28 16:43:32 +01:00
parent 8427fc4547 2e4f80d7a3
commit 97a1ccac3d
2816 changed files with 677365 additions and 342201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -1,5 +1,8 @@
# Use docker-based build environment (instead of openvz) # Use docker-based build environment (instead of openvz)
#sudo: false #sudo: false
#dist: trusty
# Use VM based build environment
sudo: required sudo: required
language: java language: java
@ -22,4 +25,5 @@ before_script:
script: script:
# - mvn -e -B clean install && cd hapi-fhir-ra && mvn -e -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean test jacoco:report coveralls:report # - mvn -e -B clean install && cd hapi-fhir-ra && mvn -e -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean test jacoco:report coveralls:report
# - mvn -Dci=true -e -B -P ALLMODULES,NOPARALLEL,ERRORPRONE clean install && cd hapi-fhir-jacoco && mvn -e -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID jacoco:report coveralls:report # - mvn -Dci=true -e -B -P ALLMODULES,NOPARALLEL,ERRORPRONE clean install && cd hapi-fhir-jacoco && mvn -e -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID jacoco:report coveralls:report
- mvn -Dci=true -e -B -P ALLMODULES,MINPARALLEL,ERRORPRONE clean install && cd hapi-fhir-jacoco && mvn -e -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID jacoco:report coveralls:report - mvn -Dci=true -e -B -P ALLMODULES,REDUCED_JPA_TESTS,ERRORPRONE clean install && cd hapi-fhir-jacoco && mvn -e -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID jacoco:report coveralls:report

5
README.md
View File

@ -3,12 +3,15 @@ hapi-fhir
HAPI FHIR - Java API for HL7 FHIR Clients and Servers HAPI FHIR - Java API for HL7 FHIR Clients and Servers
[![Build Status](https://travis-ci.org/jamesagnew/hapi-fhir.svg?branch=master)](https://travis-ci.org/jamesagnew/hapi-fhir)
[![Coverage Status](https://coveralls.io/repos/jamesagnew/hapi-fhir/badge.svg?branch=master&service=github)](https://coveralls.io/github/jamesagnew/hapi-fhir?branch=master) [![Coverage Status](https://coveralls.io/repos/jamesagnew/hapi-fhir/badge.svg?branch=master&service=github)](https://coveralls.io/github/jamesagnew/hapi-fhir?branch=master)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/ca.uhn.hapi.fhir/hapi-fhir-base/badge.svg)](http://search.maven.org/#search|ga|1|ca.uhn.hapi.fhir) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/ca.uhn.hapi.fhir/hapi-fhir-base/badge.svg)](http://search.maven.org/#search|ga|1|ca.uhn.hapi.fhir)
[![Dependency Status](https://www.versioneye.com/user/projects/55e1d0d9c6d8f2001c00043e/badge.svg?style=flat)](https://www.versioneye.com/user/projects/55e1d0d9c6d8f2001c00043e) [![Dependency Status](https://www.versioneye.com/user/projects/55e1d0d9c6d8f2001c00043e/badge.svg?style=flat)](https://www.versioneye.com/user/projects/55e1d0d9c6d8f2001c00043e)
[![License](https://img.shields.io/badge/license-apache%202.0-60C060.svg)](http://jamesagnew.github.io/hapi-fhir/license.html) [![License](https://img.shields.io/badge/license-apache%202.0-60C060.svg)](http://jamesagnew.github.io/hapi-fhir/license.html)
* Linux Build: [![Build Status](https://travis-ci.org/jamesagnew/hapi-fhir.svg?branch=master)](https://travis-ci.org/jamesagnew/hapi-fhir)
* Windows Build: <a href="https://ci.appveyor.com/project/jamesagnew/hapi-fhir"><img src="https://ci.appveyor.com/api/projects/status/github/jamesagnew/hapi-fhir?branch=master&svg=true"></a>
Complete project documentation is available here: Complete project documentation is available here:
http://jamesagnew.github.io/hapi-fhir/ http://jamesagnew.github.io/hapi-fhir/

2
appveyor.yml
View File

@ -2,6 +2,6 @@ version: 1.0.{build}
image: Visual Studio 2017 image: Visual Studio 2017
cache: cache:
- C:\maven\ - C:\maven\
- C:\Users\appveyor\.m2 - C:\Users\appveyor\.m2\repository
build_script: build_script:
- cmd: mvn -P MINPARALLEL,ALLMODULES install - cmd: mvn -P MINPARALLEL,ALLMODULES install

2
example-projects/hapi-fhir-base-example-embedded-ws/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir</artifactId> <artifactId>hapi-fhir</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>3.3.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

2
example-projects/hapi-fhir-standalone-overlay-example/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir</artifactId> <artifactId>hapi-fhir</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>3.3.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<artifactId>hapi-fhir-standalone-overlay-example</artifactId> <artifactId>hapi-fhir-standalone-overlay-example</artifactId>

2
examples/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir</artifactId> <artifactId>hapi-fhir</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>3.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

17
examples/src/main/java/example/AuthorizationInterceptors.java
View File

@ -17,6 +17,7 @@ import ca.uhn.fhir.rest.server.exceptions.AuthenticationException;
import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor; import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor;
import ca.uhn.fhir.rest.server.interceptor.auth.*; import ca.uhn.fhir.rest.server.interceptor.auth.*;
@SuppressWarnings("unused")
public class AuthorizationInterceptors { public class AuthorizationInterceptors {
public class PatientResourceProvider implements IResourceProvider public class PatientResourceProvider implements IResourceProvider
@ -35,7 +36,8 @@ public class AuthorizationInterceptors {
} }
//START SNIPPET: patientAndAdmin //START SNIPPET: patientAndAdmin
public class PatientAndAdminAuthorizationInterceptor extends AuthorizationInterceptor { @SuppressWarnings("ConstantConditions")
public class PatientAndAdminAuthorizationInterceptor extends AuthorizationInterceptor {
@Override @Override
public List<IAuthRule> buildRuleList(RequestDetails theRequestDetails) { public List<IAuthRule> buildRuleList(RequestDetails theRequestDetails) {
@ -127,5 +129,16 @@ public class AuthorizationInterceptors {
} }
//END SNIPPET: conditionalUpdate //END SNIPPET: conditionalUpdate
public void authorizeTenantAction() {
//START SNIPPET: authorizeTenantAction
new AuthorizationInterceptor(PolicyEnum.DENY) {
@Override
public List<IAuthRule> buildRuleList(RequestDetails theRequestDetails) {
return new RuleBuilder()
.allow().read().resourcesOfType(Patient.class).withAnyId().forTenantIds("TENANTA").andThen()
.build();
}
};
//END SNIPPET: authorizeTenantAction
}
} }

50
examples/src/main/java/example/Multitenancy.java Normal file
View File

@ -0,0 +1,50 @@
package example;
import ca.uhn.fhir.rest.annotation.IdParam;
import ca.uhn.fhir.rest.annotation.Read;
import ca.uhn.fhir.rest.api.server.RequestDetails;
import ca.uhn.fhir.rest.server.IResourceProvider;
import ca.uhn.fhir.rest.server.RestfulServer;
import ca.uhn.fhir.rest.server.tenant.UrlBaseTenantIdentificationStrategy;
import org.hl7.fhir.instance.model.api.IBaseResource;
import org.hl7.fhir.r4.model.IdType;
import org.hl7.fhir.r4.model.Patient;
public class Multitenancy {
//START SNIPPET: enableUrlBaseTenantIdentificationStrategy
public class MyServer extends RestfulServer {
@Override
protected void initialize() {
setTenantIdentificationStrategy(new UrlBaseTenantIdentificationStrategy());
// ... do other initialization ...
}
}
//END SNIPPET: enableUrlBaseTenantIdentificationStrategy
//START SNIPPET: resourceProvider
public class MyPatientResourceProvider implements IResourceProvider {
@Override
public Class<? extends IBaseResource> getResourceType() {
return Patient.class;
}
@Read
public Patient read(RequestDetails theRequestDetails, @IdParam IdType theId) {
String tenantId = theRequestDetails.getTenantId();
String resourceId = theId.getIdPart();
// Use these two values to fetch the patient
return new Patient();
}
}
//END SNIPPET: resourceProvider
}

2
hapi-deployable-pom/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir</artifactId> <artifactId>hapi-fhir</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>3.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
hapi-fhir-android/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-deployable-pom</artifactId> <artifactId>hapi-deployable-pom</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>3.3.0-SNAPSHOT</version>
<relativePath>../hapi-deployable-pom/pom.xml</relativePath> <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
</parent> </parent>

2
hapi-fhir-android/src/main/java/ca/uhn/fhir/android/AndroidMarker.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.android;
* #%L * #%L
* HAPI FHIR - Android * HAPI FHIR - Android
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base-test-mindeps-client/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir</artifactId> <artifactId>hapi-fhir</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>3.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
hapi-fhir-base-test-mindeps-server/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir</artifactId> <artifactId>hapi-fhir</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>3.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
hapi-fhir-base/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-deployable-pom</artifactId> <artifactId>hapi-deployable-pom</artifactId>
<version>3.2.0-SNAPSHOT</version> <version>3.3.0-SNAPSHOT</version>
<relativePath>../hapi-deployable-pom/pom.xml</relativePath> <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
</parent> </parent>

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeChildDatatypeDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeChildDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeDeclaredChildDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementCompositeDefinition.java
View File

@ -9,7 +9,7 @@ import java.lang.reflect.Modifier;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ConfigurationException.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java
View File

@ -7,7 +7,7 @@ import java.lang.reflect.Method;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirVersionEnum.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/IRuntimeDatatypeDefinition.java
View File

@ -7,7 +7,7 @@ import org.hl7.fhir.instance.model.api.IBaseDatatype;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ParserOptions.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/PerformanceOptionsEnum.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ProvidedResourceScanner.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildAny.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildChoiceDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildCompositeBoundDatatypeDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildCompositeDatatypeDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildContainedResources.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildDeclaredExtensionDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildDirectResource.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildExtension.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildNarrativeDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildPrimitiveBoundCodeDatatypeDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildPrimitiveDatatypeDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildPrimitiveEnumerationDatatypeDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildResourceBlockDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildResourceDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildUndeclaredExtensionDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeCompositeDatatypeDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeElemContainedResourceList.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeElemContainedResources.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeElementDirectResource.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeExtensionDtDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeIdDatatypeDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeNarrativeDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeXhtmlHl7OrgDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceBlockDefinition.java
View File

@ -6,7 +6,7 @@ import java.util.Map;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeSearchParam.java
View File

@ -13,7 +13,7 @@ import ca.uhn.fhir.rest.api.RestSearchParameterTypeEnum;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/api/AddProfileTagEnum.java
View File

@ -6,7 +6,7 @@ import ca.uhn.fhir.context.FhirContext;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/api/BundleInclusionRule.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context.api;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/IContextValidationSupport.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.context.support;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/fluentpath/FluentPathExecutionException.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.fluentpath;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/fluentpath/IFluentPath.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.fluentpath;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

77
hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/HapiLocalizer.java
View File

@ -1,12 +1,18 @@
package ca.uhn.fhir.i18n; package ca.uhn.fhir.i18n;
import ca.uhn.fhir.context.ConfigurationException;
import java.text.MessageFormat;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank;
/* /*
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -22,30 +28,18 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
* #L% * #L%
*/ */
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.ResourceBundle;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import ca.uhn.fhir.context.ConfigurationException;
/** /**
* This feature is not yet in its final state and should be considered an internal part of HAPI for now - use with caution * This feature is not yet in its final state and should be considered an internal part of HAPI for now - use with caution
*/ */
public class HapiLocalizer { public class HapiLocalizer {
private static boolean ourFailOnMissingMessage; @SuppressWarnings("WeakerAccess")
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(HapiLocalizer.class);
public static final String UNKNOWN_I18N_KEY_MESSAGE = "!MESSAGE!"; public static final String UNKNOWN_I18N_KEY_MESSAGE = "!MESSAGE!";
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(HapiLocalizer.class);
private List<ResourceBundle> myBundle = new ArrayList<ResourceBundle>(); private static boolean ourFailOnMissingMessage;
private final Map<String, MessageFormat> myKeyToMessageFormat = new ConcurrentHashMap<>();
private List<ResourceBundle> myBundle = new ArrayList<>();
private String[] myBundleNames; private String[] myBundleNames;
private final Map<String, MessageFormat> myKeyToMessageFormat = new ConcurrentHashMap<String, MessageFormat>();
public HapiLocalizer() { public HapiLocalizer() {
this(HapiLocalizer.class.getPackage().getName() + ".hapi-messages"); this(HapiLocalizer.class.getPackage().getName() + ".hapi-messages");
@ -56,7 +50,22 @@ public class HapiLocalizer {
init(); init();
} }
private String findFormatString(String theQualifiedKey) { public Set<String> getAllKeys() {
HashSet<String> retVal = new HashSet<>();
for (ResourceBundle nextBundle : myBundle) {
Enumeration<String> keysEnum = nextBundle.getKeys();
while (keysEnum.hasMoreElements()) {
retVal.add(keysEnum.nextElement());
}
}
return retVal;
}
/**
* @return Returns the raw message format string for the given key, or returns {@link #UNKNOWN_I18N_KEY_MESSAGE} if not found
*/
@SuppressWarnings("WeakerAccess")
public String getFormatString(String theQualifiedKey) {
String formatString = null; String formatString = null;
for (ResourceBundle nextBundle : myBundle) { for (ResourceBundle nextBundle : myBundle) {
if (nextBundle.containsKey(theQualifiedKey)) { if (nextBundle.containsKey(theQualifiedKey)) {
@ -77,36 +86,24 @@ public class HapiLocalizer {
return formatString; return formatString;
} }
public Set<String> getAllKeys(){
HashSet<String> retVal = new HashSet<String>();
for (ResourceBundle nextBundle : myBundle) {
Enumeration<String> keysEnum = nextBundle.getKeys();
while (keysEnum.hasMoreElements()) {
retVal.add(keysEnum.nextElement());
}
}
return retVal;
}
public String getMessage(Class<?> theType, String theKey, Object... theParameters) { public String getMessage(Class<?> theType, String theKey, Object... theParameters) {
return getMessage(theType.getName() + '.' + theKey, theParameters); return getMessage(toKey(theType, theKey), theParameters);
} }
public String getMessage(String theQualifiedKey, Object... theParameters) { public String getMessage(String theQualifiedKey, Object... theParameters) {
if (theParameters != null && theParameters.length > 0) { if (theParameters != null && theParameters.length > 0) {
MessageFormat format = myKeyToMessageFormat.get(theQualifiedKey); MessageFormat format = myKeyToMessageFormat.get(theQualifiedKey);
if (format != null) { if (format != null) {
return format.format(theParameters).toString(); return format.format(theParameters);
} }
String formatString = findFormatString(theQualifiedKey); String formatString = getFormatString(theQualifiedKey);
format = new MessageFormat(formatString.trim()); format = new MessageFormat(formatString.trim());
myKeyToMessageFormat.put(theQualifiedKey, format); myKeyToMessageFormat.put(theQualifiedKey, format);
return format.format(theParameters).toString(); return format.format(theParameters);
} }
String retVal = findFormatString(theQualifiedKey); return getFormatString(theQualifiedKey);
return retVal;
} }
protected void init() { protected void init() {
@ -114,7 +111,7 @@ public class HapiLocalizer {
myBundle.add(ResourceBundle.getBundle(nextName)); myBundle.add(ResourceBundle.getBundle(nextName));
} }
} }
/** /**
* This <b>global setting</b> causes the localizer to fail if any attempts * This <b>global setting</b> causes the localizer to fail if any attempts
* are made to retrieve a key that does not exist. This method is primarily for * are made to retrieve a key that does not exist. This method is primarily for
@ -123,5 +120,9 @@ public class HapiLocalizer {
public static void setOurFailOnMissingMessage(boolean ourFailOnMissingMessage) { public static void setOurFailOnMissingMessage(boolean ourFailOnMissingMessage) {
HapiLocalizer.ourFailOnMissingMessage = ourFailOnMissingMessage; HapiLocalizer.ourFailOnMissingMessage = ourFailOnMissingMessage;
} }
public static String toKey(Class<?> theType, String theKey) {
return theType.getName() + '.' + theKey;
}
} }

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseBundle.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseElement.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BaseIdentifiableElement.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/BasePrimitive.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ExtensionDt.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IBoundCodeableConcept.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeDatatype.java
View File

@ -6,7 +6,7 @@ import org.hl7.fhir.instance.model.api.ICompositeType;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ICompositeElement.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IDatatype.java
View File

@ -6,7 +6,7 @@ import org.hl7.fhir.instance.model.api.IBaseDatatype;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IElement.java
View File

@ -6,7 +6,7 @@ import org.hl7.fhir.instance.model.api.IBase;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IExtension.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IIdentifiableElement.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IPrimitiveDatatype.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IPrimitiveDatatypeWithPrecision.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterAnd.java
View File

@ -6,7 +6,7 @@ import java.io.Serializable;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterOr.java
View File

@ -6,7 +6,7 @@ import java.io.Serializable;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IQueryParameterType.java
View File

@ -8,7 +8,7 @@ import ca.uhn.fhir.context.FhirContext;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IResource.java
View File

@ -6,7 +6,7 @@ import org.hl7.fhir.instance.model.api.IBaseMetaType;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IResourceBlock.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ISupportsUndeclaredExtensions.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IValueSetEnumBinder.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Include.java
View File

@ -11,7 +11,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ResourceMetadataKeyEnum.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Tag.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/TagList.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/TemporalPrecisionEnum.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Binding.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Block.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Child.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/ChildOrder.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Compartment.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/DatatypeDef.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Description.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/Extension.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/ProvidesResources.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/ResourceDef.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/SearchParamDefinition.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/annotation/SimpleSetter.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.api.annotation;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseCodingDt.java
View File

@ -4,7 +4,7 @@ package ca.uhn.fhir.model.base.composite;
* #%L * #%L
* HAPI FHIR - Core Library * HAPI FHIR - Core Library
* %% * %%
* Copyright (C) 2014 - 2017 University Health Network * Copyright (C) 2014 - 2018 University Health Network
* %% * %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

Some files were not shown because too many files have changed in this diff Show More