From 61adf61fc0ca35ff0980525f869c4fe572808b6b Mon Sep 17 00:00:00 2001
From: "jelmer.terwal" <jelmer.terwal@nedap.com>
Date: Tue, 22 Oct 2019 13:58:32 +0200
Subject: [PATCH] Remove no longer needed stuff

---
 hapi-kotlin-test/pom.xml                      | 176 ------------------
 .../kotlin/ca/uhn/fhir/rest/server/Server.kt  |  15 --
 .../rest/server/resources/ExtendedPatient.kt  |  22 ---
 3 files changed, 213 deletions(-)
 delete mode 100644 hapi-kotlin-test/pom.xml
 delete mode 100644 hapi-kotlin-test/src/main/kotlin/ca/uhn/fhir/rest/server/Server.kt
 delete mode 100644 hapi-kotlin-test/src/main/kotlin/ca/uhn/fhir/rest/server/resources/ExtendedPatient.kt

diff --git a/hapi-kotlin-test/pom.xml b/hapi-kotlin-test/pom.xml
deleted file mode 100644
index 2ecc4d98617..00000000000
--- a/hapi-kotlin-test/pom.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-			xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<parent>
-		<artifactId>hapi-fhir</artifactId>
-		<groupId>ca.uhn.hapi.fhir</groupId>
-		<version>4.1.0-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-
-	<artifactId>hapi-kotlin-test</artifactId>
-
-	<name>HAPI FHIR - Kotlin tests</name>
-
-	<dependencies>
-		<!-- This dependency includes the core HAPI-FHIR classes -->
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-jaxrsserver-base</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-<!--		<dependency>-->
-<!--			<groupId>ca.uhn.hapi.fhir</groupId>-->
-<!--			<artifactId>hapi-fhir-validation-resources-dstu3</artifactId>-->
-<!--			<version>${project.version}</version>-->
-<!--		</dependency>-->
-<!--		<dependency>-->
-<!--			<groupId>ca.uhn.hapi.fhir</groupId>-->
-<!--			<artifactId>hapi-fhir-structures-dstu3</artifactId>-->
-<!--			<version>${project.version}</version>-->
-<!--		</dependency>-->
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>org.hl7.fhir.dstu3</artifactId>
-			<version>${fhir_core_version}</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.ws.rs</groupId>
-			<artifactId>javax.ws.rs-api</artifactId>
-			<version>2.0.1</version>
-			<scope>provided</scope>
-		</dependency>
-<!--		<dependency>-->
-<!--			<groupId>javax.ejb</groupId>-->
-<!--			<artifactId>ejb-api</artifactId>-->
-<!--			<version>3.0</version>-->
-<!--			<scope>provided</scope>-->
-<!--		</dependency>-->
-
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-server</artifactId>
-			<version>${jetty_version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlet</artifactId>
-			<version>${jetty_version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.resteasy</groupId>
-			<artifactId>resteasy-jaxrs</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.resteasy</groupId>
-			<artifactId>resteasy-client</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-test-utilities</artifactId>
-			<version>${project.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- This dependency includes the core HAPI-FHIR classes -->
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-base</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<!-- Include the HAPI server framework -->
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-server</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<!-- This dependency is used for the "FHIR Tester" web app overlay -->
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-testpage-overlay</artifactId>
-			<version>${project.version}</version>
-			<type>war</type>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-testpage-overlay</artifactId>
-			<version>${project.version}</version>
-			<classifier>classes</classifier>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-maven-allopen</artifactId>
-			<version>${kotlin.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-maven-noarg</artifactId>
-			<version>${kotlin.version}</version>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.jetbrains.kotlin</groupId>
-				<artifactId>kotlin-maven-plugin</artifactId>
-				<version>${kotlin.version}</version>
-				<executions>
-					<execution>
-						<id>compile</id>
-						<goals> <goal>compile</goal> </goals>
-						<configuration>
-							<sourceDirs>
-								<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
-								<sourceDir>${project.basedir}/src/main/java</sourceDir>
-							</sourceDirs>
-						</configuration>
-					</execution>
-					<execution>
-						<id>test-compile</id>
-						<goals> <goal>test-compile</goal> </goals>
-						<configuration>
-							<sourceDirs>
-								<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
-								<sourceDir>${project.basedir}/src/test/java</sourceDir>
-							</sourceDirs>
-						</configuration>
-					</execution>
-				</executions>
-				<configuration>
-					<compilerPlugins>
-						<plugin>no-arg</plugin>
-						<plugin>all-open</plugin>
-					</compilerPlugins>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Fragment-Host>
-							ca.uhn.hapi.fhir.hapi-fhir-base
-						</Fragment-Host>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<properties>
-		<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
-		<kotlin.version>1.3.50</kotlin.version>
-	</properties>
-</project>
diff --git a/hapi-kotlin-test/src/main/kotlin/ca/uhn/fhir/rest/server/Server.kt b/hapi-kotlin-test/src/main/kotlin/ca/uhn/fhir/rest/server/Server.kt
deleted file mode 100644
index ab030221cf7..00000000000
--- a/hapi-kotlin-test/src/main/kotlin/ca/uhn/fhir/rest/server/Server.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package ca.uhn.fhir.rest.server
-
-import ca.uhn.fhir.rest.server.resources.ExtendedPatient
-import ca.uhn.fhir.jaxrs.server.AbstractJaxRsResourceProvider
-import org.hl7.fhir.instance.model.api.IAnyResource
-
-class Server : BaseResource<ExtendedPatient>() {
-   override fun getResourceType(): Class<ExtendedPatient>? = ExtendedPatient::class.java
-}
-
-abstract class BaseResource<T: IAnyResource>: AbstractJaxRsResourceProvider<T>()
-
-fun main() {
-
-}
diff --git a/hapi-kotlin-test/src/main/kotlin/ca/uhn/fhir/rest/server/resources/ExtendedPatient.kt b/hapi-kotlin-test/src/main/kotlin/ca/uhn/fhir/rest/server/resources/ExtendedPatient.kt
deleted file mode 100644
index 70ab2e347b8..00000000000
--- a/hapi-kotlin-test/src/main/kotlin/ca/uhn/fhir/rest/server/resources/ExtendedPatient.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package ca.uhn.fhir.rest.server.resources
-
-import ca.uhn.fhir.model.api.annotation.Child
-import ca.uhn.fhir.model.api.annotation.Extension
-import ca.uhn.fhir.model.api.annotation.ResourceDef
-import org.hl7.fhir.dstu3.model.CodeableConcept
-import org.hl7.fhir.dstu3.model.Patient
-import org.hl7.fhir.instance.model.api.IBaseResource
-
-import java.util.Collections.emptyList
-
-@ResourceDef(name = "Patient")
-class ExtendedPatient : Patient() {
-
-   @Child(name = "status")
-   @Extension(
-      url = "http://some.url",
-      definedLocally = false,
-      isModifier = false
-   )
-   var status: List<CodeableConcept> = emptyList()
-}