From df72b285fc954f3bf32f9b0c678b162e59cdbaf3 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 10 Dec 2015 16:44:20 +0100
Subject: [PATCH] built-in server: workaround for changed logic of generating
 wildcards in method signatures between Kotlin beta 3 and beta 4

---
 .../org/jetbrains/builtInWebServer/ssi/SsiCommand.java   | 9 +++++++++
 .../jetbrains/builtInWebServer/ssi/SsiConditional.java   | 2 +-
 .../src/org/jetbrains/builtInWebServer/ssi/SsiFsize.java | 2 +-
 .../org/jetbrains/builtInWebServer/ssi/SsiProcessor.kt   | 4 ----
 4 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 platform/built-in-server/src/org/jetbrains/builtInWebServer/ssi/SsiCommand.java

diff --git a/platform/built-in-server/src/org/jetbrains/builtInWebServer/ssi/SsiCommand.java b/platform/built-in-server/src/org/jetbrains/builtInWebServer/ssi/SsiCommand.java
new file mode 100644
index 000000000000..2560e417ee1d
--- /dev/null
+++ b/platform/built-in-server/src/org/jetbrains/builtInWebServer/ssi/SsiCommand.java
@@ -0,0 +1,9 @@
+package org.jetbrains.builtInWebServer.ssi;
+
+import io.netty.buffer.ByteBufUtf8Writer;
+
+import java.util.List;
+
+public interface SsiCommand {
+  long process(SsiProcessingState state, String commandName, List<String> paramNames, String[]paramValues, ByteBufUtf8Writer writer);
+}
diff --git a/platform/built-in-server/src/org/jetbrains/builtInWebServer/ssi/SsiConditional.java b/platform/built-in-server/src/org/jetbrains/builtInWebServer/ssi/SsiConditional.java
index 0aba822c3409..27ab31833c2b 100644
--- a/platform/built-in-server/src/org/jetbrains/builtInWebServer/ssi/SsiConditional.java
+++ b/platform/built-in-server/src/org/jetbrains/builtInWebServer/ssi/SsiConditional.java
@@ -31,7 +31,7 @@ import java.util.List;
 public class SsiConditional implements SsiCommand {
   @SuppressWarnings("SpellCheckingInspection")
   @Override
-  public long process(@NotNull SsiProcessingState ssiProcessingState, @NotNull String commandName, @NotNull List<? extends String> paramNames, @NotNull String[] paramValues, @NotNull ByteBufUtf8Writer writer) {
+  public long process(@NotNull SsiProcessingState ssiProcessingState, @NotNull String commandName, @NotNull List<String> paramNames, @NotNull String[] paramValues, @NotNull ByteBufUtf8Writer writer) {
     // Assume anything using conditionals was modified by it
     long lastModified = System.currentTimeMillis();
     // Retrieve the current state information
diff --git a/platform/built-in-server/src/org/jetbrains/builtInWebServer/ssi/SsiFsize.java b/platform/built-in-server/src/org/jetbrains/builtInWebServer/ssi/SsiFsize.java
index d1346c19350f..461eb3aa611b 100644
--- a/platform/built-in-server/src/org/jetbrains/builtInWebServer/ssi/SsiFsize.java
+++ b/platform/built-in-server/src/org/jetbrains/builtInWebServer/ssi/SsiFsize.java
@@ -35,7 +35,7 @@ final class SsiFsize implements SsiCommand {
   private static final int ONE_MEGABYTE = 1024 * 1024;
 
   @Override
-  public long process(@NotNull SsiProcessingState state, @NotNull String commandName, @NotNull List<? extends String> paramNames, @NotNull String[] paramValues, @NotNull ByteBufUtf8Writer writer) {
+  public long process(@NotNull SsiProcessingState state, @NotNull String commandName, @NotNull List<String> paramNames, @NotNull String[] paramValues, @NotNull ByteBufUtf8Writer writer) {
     long lastModified = 0;
     String configErrMsg = state.configErrorMessage;
     for (int i = 0; i < paramNames.size(); i++) {
diff --git a/platform/built-in-server/src/org/jetbrains/builtInWebServer/ssi/SsiProcessor.kt b/platform/built-in-server/src/org/jetbrains/builtInWebServer/ssi/SsiProcessor.kt
index 70d12f81c71e..717597292685 100644
--- a/platform/built-in-server/src/org/jetbrains/builtInWebServer/ssi/SsiProcessor.kt
+++ b/platform/built-in-server/src/org/jetbrains/builtInWebServer/ssi/SsiProcessor.kt
@@ -31,10 +31,6 @@ internal val LOG = Logger.getInstance(SsiProcessor::class.java)
 internal val COMMAND_START = "<!--#"
 internal val COMMAND_END = "-->"
 
-interface SsiCommand {
-  fun process(state: SsiProcessingState, commandName: String, paramNames: List<String>, paramValues: Array<String>, writer: ByteBufUtf8Writer): Long
-}
-
 class SsiStopProcessingException : RuntimeException()
 
 class SsiProcessor(allowExec: Boolean) {