From e38ab31eecbcdbc3b3ea4b6001770e7100ef9240 Mon Sep 17 00:00:00 2001 From: Rob Daugherty Date: Wed, 12 Sep 2018 11:57:43 -0400 Subject: Remove unused connectors and modules NexusIQ issue: org.codehaus.jackson Jersey 2.6 uses codehaus.jackson which has security vulnerabilities. Rather than upgrading the Jersey version, I'm totally removing the Jersey, Jersey2, and RESTEasy connectors. We don't use them. I'm also removing the console and examples modules. They haven't even been compiled in a long time. Unit test coverage will go up to 74%. Change-Id: Ie0145e56718adfe5ea7a677439564e7a25c73fe6 Issue-ID: SO-864 Signed-off-by: Rob Daugherty --- .../common/client/AbstractOpenStackClient.java | 141 --------------------- 1 file changed, 141 deletions(-) delete mode 100644 openstack-client/src/main/java/com/woorea/openstack/common/client/AbstractOpenStackClient.java (limited to 'openstack-client/src') diff --git a/openstack-client/src/main/java/com/woorea/openstack/common/client/AbstractOpenStackClient.java b/openstack-client/src/main/java/com/woorea/openstack/common/client/AbstractOpenStackClient.java deleted file mode 100644 index 4319304..0000000 --- a/openstack-client/src/main/java/com/woorea/openstack/common/client/AbstractOpenStackClient.java +++ /dev/null @@ -1,141 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * 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. - * ============LICENSE_END========================================================= - */ - -package com.woorea.openstack.common.client; -//package org.openstack.common.client; -// -//import java.io.IOException; -//import java.util.logging.Logger; -// -//import javax.ws.rs.client.ClientRequestContext; -//import javax.ws.rs.client.ClientRequestFilter; -//import javax.ws.rs.client.Entity; -//import javax.ws.rs.client.Invocation.Builder; -//import javax.ws.rs.client.WebTarget; -//import javax.ws.rs.core.MediaType; -// -//import org.glassfish.jersey.filter.LoggingFilter; -//import org.openstack.connector.OpenStack; -// -//public class AbstractOpenStackClient { -// -// protected String endpointURL; -// -// protected String token; -// -// protected LoggingFilter loggingFilter; -// -// protected ClientRequestFilter tokenFilter = new ClientRequestFilter() { -// -// @Override -// public void filter(ClientRequestContext requestContext) throws IOException { -// requestContext.getHeaders().putSingle("X-Auth-Token", token); -// } -// }; -// -// public AbstractOpenStackClient(String endpointURL, String token) { -// this.endpointURL = endpointURL; -// this.token = token; -// } -// -// public AbstractOpenStackClient(String endpointURL) { -// this(endpointURL, null); -// } -// -// /** -// * @param token the token to set -// */ -// public void setToken(String token) { -// this.token = token; -// } -// -// public OpenStackRequest request(String uri, String... mediaTypes) { -// WebTarget endpoint = OpenStack.CLIENT.target(endpointURL); -// if(token != null) { -// endpoint.register(tokenFilter); -// } -// return new OpenStackRequest(endpoint.path(uri).request(mediaTypes)); -// } -// -// public OpenStackRequest request(String uri) { -// return request(uri, MediaType.APPLICATION_JSON); -// } -// -// protected WebTarget create(String endpoint) { -// WebTarget target = OpenStack.CLIENT.target(endpoint); -// if(loggingFilter != null) { -// target.register(loggingFilter); -// } -// if(token != null) { -// target.register(tokenFilter); -// } -// return target; -// } -// -// public void enableLogging(Logger logger, int entitySize) { -// loggingFilter = new LoggingFilter(logger, entitySize); -// } -// -// public void disableLogging() { -// loggingFilter = null; -// } -// -// public static class OpenStackRequest { -// -// private Builder builder; -// -// private OpenStackRequest(Builder builder) { -// this.builder = builder; -// } -// -// public ResponseType execute(String method, Class type) { -// return builder.method(method, type); -// } -// -// public ResponseType execute(String method, Entity data, Class type) { -// return builder.method(method, data, type); -// } -// -// public void execute(String method) { -// builder.method(method); -// } -// -// public void execute(String method, Entity data) { -// builder.method(method, data, Void.class); -// } -// -// public ResponseType get(Class type) { -// return execute("GET", type); -// } -// -// public ResponseType postJson(Object data, Class type) { -// return execute("POST", Entity.json(data), type); -// } -// -// public ResponseType putJson(Object data, Class type) { -// return execute("PUT", Entity.json(data), type); -// } -// -// public ResponseType patchJson(Object data, Class type) { -// return execute("PATCH", Entity.json(data), type); -// } -// -// public void delete() { -// execute("DELETE", Void.class); -// } -// } -// -//} -- cgit 1.2.3-korg