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

Merge a2075814c0 into fb7571185a

This commit is contained in:
jmarchionatto 2024-09-26 15:37:57 -04:00 committed by GitHub
parent fb7571185a a2075814c0
commit b18266fd19
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 28 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hapi-fhir-base/src/main/java/ca/uhn/fhir/repository/Repository.java
View File

@ -1,22 +1,3 @@
/*-
* #%L
* HAPI FHIR - Core Library
* %%
* Copyright (C) 2014 - 2024 Smile CDR, Inc.
* %%
* Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
package ca.uhn.fhir.repository;
import ca.uhn.fhir.context.FhirContext;

3
hapi-fhir-jpaserver-base/pom.xml
View File

@ -414,7 +414,6 @@
<plugin>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-tinder-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
<id>build_dstu2</id>
@ -525,7 +524,6 @@
<plugin>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-tinder-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
<goals>
@ -534,6 +532,7 @@
</execution>
</executions>
<configuration>
<skip>false</skip>
<packageNames>
<packageName>ca.uhn.fhir.jpa.entity</packageName>
<packageName>ca.uhn.fhir.jpa.model.entity</packageName>

19
hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/embedded/OracleCondition.java
View File

@ -1,22 +1,3 @@
/*-
* #%L
* HAPI FHIR JPA Server Test Utilities
* %%
* Copyright (C) 2014 - 2024 Smile CDR, Inc.
* %%
* Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
package ca.uhn.fhir.jpa.embedded;
import org.apache.commons.lang3.StringUtils;

19
hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/embedded/annotation/OracleTest.java
View File

@ -1,22 +1,3 @@
/*-
* #%L
* HAPI FHIR JPA Server Test Utilities
* %%
* Copyright (C) 2014 - 2024 Smile CDR, Inc.
* %%
* Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/
package ca.uhn.fhir.jpa.embedded.annotation;
import ca.uhn.fhir.jpa.embedded.OracleCondition;

1
hapi-tinder-plugin/pom.xml
View File

@ -265,6 +265,7 @@
<configuration>
<!-- see http://jira.codehaus.org/browse/MNG-5346 -->
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
<goalPrefix>hapi-tinder</goalPrefix>
</configuration>
<executions>

1
hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ddl/DdlGeneratorHibernate61.java
View File

@ -250,6 +250,7 @@ public class DdlGeneratorHibernate61 {
Resource resource = loader.getResource(prependFile);
try (Writer w = new FileWriter(outputFile, true)) {
w.append(resource.getContentAsString(StandardCharsets.UTF_8));
ourLog.info("Added contents of file: {}", prependFile);
} catch (IOException e) {
throw new MojoFailureException("Failed to write to file " + outputFile + ": " + e.getMessage(), e);
}

7
hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ddl/GenerateDdlMojo.java
View File

@ -36,11 +36,18 @@ public class GenerateDdlMojo extends AbstractMojo {
@Parameter
String outputDirectory;
@Parameter(defaultValue = "false")
boolean skip;
@Parameter(defaultValue = "${project}", readonly = true)
private transient MavenProject project;
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
if (skip) {
return;
}
ourLog.info("Going to generate DDL files in directory: {}", outputDirectory);
File outputDirectoryFile = new File(outputDirectory);

18
pom.xml
View File

@ -2604,6 +2604,24 @@
</excludes>
</configuration>
</plugin>
<!-- Generate the DDL schema files -->
<plugin>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-tinder-plugin</artifactId>
<version>7.5.0-SNAPSHOT</version>
<executions>
<execution>
<goals>
<goal>generate-ddl</goal>
</goals>
</execution>
</executions>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>