From 1bf1521b37e8731ac3e194cbdda23a7512c1bc27 Mon Sep 17 00:00:00 2001
From: Nik Everett <nik9000@gmail.com>
Date: Sat, 4 Nov 2017 01:54:21 +0000
Subject: [PATCH] SQL: Remove a package (elastic/x-pack-elasticsearch#2837)

Collapses a package into its parent package because they only contain a
single class together. No need for two layers.

Original commit: elastic/x-pack-elasticsearch@c947e579521cc0416c1dc362176885fe00d405b7
---
 plugin/src/main/java/org/elasticsearch/xpack/XPackPlugin.java   | 2 +-
 .../xpack/sql/{plugin => }/SecurityCatalogFilter.java           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename plugin/src/main/java/org/elasticsearch/xpack/sql/{plugin => }/SecurityCatalogFilter.java (99%)

diff --git a/plugin/src/main/java/org/elasticsearch/xpack/XPackPlugin.java b/plugin/src/main/java/org/elasticsearch/xpack/XPackPlugin.java
index 2cc9f8957df..f5d8a1274bd 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/XPackPlugin.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/XPackPlugin.java
@@ -104,7 +104,7 @@ import org.elasticsearch.xpack.security.authc.AuthenticationService;
 import org.elasticsearch.xpack.security.authc.support.UsernamePasswordToken;
 import org.elasticsearch.xpack.security.crypto.CryptoService;
 import org.elasticsearch.xpack.sql.analysis.catalog.FilteredCatalog;
-import org.elasticsearch.xpack.sql.plugin.SecurityCatalogFilter;
+import org.elasticsearch.xpack.sql.SecurityCatalogFilter;
 import org.elasticsearch.xpack.sql.plugin.SqlLicenseChecker;
 import org.elasticsearch.xpack.sql.plugin.SqlPlugin;
 import org.elasticsearch.xpack.ssl.SSLConfigurationReloader;
diff --git a/plugin/src/main/java/org/elasticsearch/xpack/sql/plugin/SecurityCatalogFilter.java b/plugin/src/main/java/org/elasticsearch/xpack/sql/SecurityCatalogFilter.java
similarity index 99%
rename from plugin/src/main/java/org/elasticsearch/xpack/sql/plugin/SecurityCatalogFilter.java
rename to plugin/src/main/java/org/elasticsearch/xpack/sql/SecurityCatalogFilter.java
index a59b2ed6060..c26600d2938 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/sql/plugin/SecurityCatalogFilter.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/sql/SecurityCatalogFilter.java
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.sql.plugin;
+package org.elasticsearch.xpack.sql;
 
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.common.util.concurrent.ThreadContext;