thelabdude commented on a change in pull request #2010: URL: https://github.com/apache/lucene-solr/pull/2010#discussion_r508863404
########## File path: solr/solrj/src/java/org/apache/solr/common/cloud/GlobalStateVars.java ########## @@ -0,0 +1,79 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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. + */ +package org.apache.solr.common.cloud; + +import static org.apache.solr.common.cloud.ZkStateReader.URL_SCHEME; + +/** + * Singleton access to global vars in persisted state, such as the urlScheme, which although is stored in ZK as a cluster property + * really should be treated like a static global that is set at initialization and not altered after. + */ +public class GlobalStateVars { + + public static final String HTTP = "http"; + public static final String HTTPS = "https"; + public static final String SCHEME_VAR = "${scheme}://"; + public static final String HTTPS_PORT_PROP = "solr.jetty.https.port"; + + private static final GlobalStateVars _singleton = new GlobalStateVars(); + + public static GlobalStateVars singleton() { + return _singleton; + } + + private String urlScheme = System.getProperty(URL_SCHEME, HTTP); + + // no new! you have to use the static singleton! + private GlobalStateVars() { + } + + /** + * Set the global urlScheme variable; ideally this should be immutable once set, but some tests rely on changing + * the value on-the-fly. + * @param urlScheme The new URL scheme, either http or https. + */ + public void setUrlScheme(final String urlScheme) { + if (HTTP.equals(urlScheme) || HTTPS.equals(urlScheme)) { + this.urlScheme = urlScheme; + } else { + throw new IllegalArgumentException("Invalid urlScheme: "+urlScheme); + } + } + + /** + * Given a URL with a replaceable parameter for the scheme, return a new URL with the correct scheme applied. + * @param url A URL to change the scheme (http|https) + * @return A new URL with the correct scheme or null if the supplied url remains unchanged. + */ + public String applyUrlSchemeIfChanged(final String url) { Review comment: yeah, it's ugly for sure, but wanted to capture the fact that the url didn't change ... how about Optional instead? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org
