opendev/gerrit
Code Issues Proposed changes

Move init-api rule srcs to a subpackage, init.api

Browse Source 
Previously, the only way to see the boundary between the init-base
package and -api was to look at the list of srcs. Putting a package
boundary between them makes it easier to understand without reading
the BUCK file.

Change-Id: I2ccb43cc9154b6979a867b01b4e3ea86070dc30f
This commit is contained in:
Dave Borowitz
2014-07-28 11:36:27 -07:00
parent d2cf6d4dc6
commit 684461910e
36 changed files with 89 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gerrit-pgm/BUCK
View File

@@ -1,15 +1,6 @@
SRCS = 'src/main/java/com/google/gerrit/pgm/'
INIT_API_SRCS = [SRCS + n for n in [
'init/AllProjectsConfig.java',
'init/AllProjectsNameOnInitProvider.java',
'init/ConsoleUI.java',
'init/InitFlags.java',
'init/InitStep.java',
'init/InitStep.java',
'init/InstallPlugins.java',
'init/Section.java',
]]
INIT_API_SRCS = glob([SRCS + 'init/api/*.java'])
java_library(
name = 'init-api',
@@ -35,11 +26,10 @@ java_sources(
INIT_BASE_SRCS = [SRCS + 'BaseInit.java'] + glob(
[SRCS + n for n in [
'init/**/*.java',
'init/*.java',
'util/**/*.java',
]],
excludes = INIT_API_SRCS +
[SRCS + n for n in [
excludes = [SRCS + n for n in [
'init/Browser.java',
'util/ErrorLogFile.java',
'util/GarbageCollectionLogFile.java',

6
gerrit-pgm/src/main/java/com/google/gerrit/pgm/BaseInit.java
View File

@@ -20,12 +20,12 @@ import static com.google.inject.Stage.PRODUCTION;
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
import com.google.gerrit.common.Die;
import com.google.gerrit.pgm.init.ConsoleUI;
import com.google.gerrit.pgm.init.InitFlags;
import com.google.gerrit.pgm.init.InitModule;
import com.google.gerrit.pgm.init.InstallPlugins;
import com.google.gerrit.pgm.init.PluginsDistribution;
import com.google.gerrit.pgm.init.SitePathInitializer;
import com.google.gerrit.pgm.init.api.ConsoleUI;
import com.google.gerrit.pgm.init.api.InitFlags;
import com.google.gerrit.pgm.init.api.InstallPlugins;
import com.google.gerrit.pgm.util.SiteProgram;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.config.SitePath;

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java
View File

@@ -20,8 +20,8 @@ import com.google.common.collect.Lists;
import com.google.gerrit.common.PageLinks;
import com.google.gerrit.common.PluginData;
import com.google.gerrit.pgm.init.Browser;
import com.google.gerrit.pgm.init.ConsoleUI;
import com.google.gerrit.pgm.init.InitPlugins;
import com.google.gerrit.pgm.init.api.ConsoleUI;
import com.google.gerrit.pgm.util.ErrorLogFile;
import com.google.gerrit.pgm.util.IoUtil;
import com.google.gerrit.server.config.GerritServerConfigModule;

1
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/AllUsersNameOnInitProvider.java
View File

@@ -16,6 +16,7 @@ package com.google.gerrit.pgm.init;
import com.google.common.base.Objects;
import com.google.common.base.Strings;
import com.google.gerrit.pgm.init.api.Section;
import com.google.gerrit.server.config.AllUsersNameProvider;
import com.google.inject.Inject;
import com.google.inject.Provider;

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/DatabaseConfigInitializer.java
View File

@@ -14,6 +14,8 @@
package com.google.gerrit.pgm.init;
import com.google.gerrit.pgm.init.api.Section;
/** Abstraction of initializer for the database section */
interface DatabaseConfigInitializer {

1
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/H2Initializer.java
View File

@@ -14,6 +14,7 @@
package com.google.gerrit.pgm.init;
import com.google.gerrit.pgm.init.api.Section;
import com.google.gerrit.server.config.SitePaths;
import com.google.inject.Inject;

3
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitAuth.java
View File

@@ -16,6 +16,9 @@ package com.google.gerrit.pgm.init;
import static com.google.gerrit.pgm.init.InitUtil.dnOf;
import com.google.gerrit.pgm.init.api.ConsoleUI;
import com.google.gerrit.pgm.init.api.InitStep;
import com.google.gerrit.pgm.init.api.Section;
import com.google.gerrit.reviewdb.client.AuthType;
import com.google.gwtjsonrpc.server.SignedToken;
import com.google.inject.Inject;

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitCache.java
View File

@@ -16,6 +16,8 @@ package com.google.gerrit.pgm.init;
import static com.google.gerrit.pgm.init.InitUtil.die;
import com.google.gerrit.pgm.init.api.InitStep;
import com.google.gerrit.pgm.init.api.Section;
import com.google.gerrit.server.config.SitePaths;
import com.google.inject.Inject;
import com.google.inject.Singleton;

3
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitContainer.java
View File

@@ -18,6 +18,9 @@ import static com.google.gerrit.pgm.init.InitUtil.die;
import static com.google.gerrit.pgm.init.InitUtil.username;
import com.google.gerrit.launcher.GerritLauncher;
import com.google.gerrit.pgm.init.api.ConsoleUI;
import com.google.gerrit.pgm.init.api.InitStep;
import com.google.gerrit.pgm.init.api.Section;
import com.google.gerrit.server.config.SitePaths;
import com.google.inject.Inject;
import com.google.inject.Singleton;

3
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitDatabase.java
View File

@@ -18,6 +18,9 @@ import static com.google.inject.Stage.PRODUCTION;
import com.google.common.base.Strings;
import com.google.common.collect.Sets;
import com.google.gerrit.pgm.init.api.ConsoleUI;
import com.google.gerrit.pgm.init.api.InitStep;
import com.google.gerrit.pgm.init.api.Section;
import com.google.gerrit.server.config.SitePaths;
import com.google.inject.Binding;
import com.google.inject.Guice;

3
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitGitManager.java
View File

@@ -16,6 +16,9 @@ package com.google.gerrit.pgm.init;
import static com.google.gerrit.pgm.init.InitUtil.die;
import com.google.gerrit.pgm.init.api.ConsoleUI;
import com.google.gerrit.pgm.init.api.InitStep;
import com.google.gerrit.pgm.init.api.Section;
import com.google.inject.Inject;
import com.google.inject.Singleton;

4
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitHttpd.java
View File

@@ -20,6 +20,10 @@ import static com.google.gerrit.pgm.init.InitUtil.domainOf;
import static com.google.gerrit.pgm.init.InitUtil.isAnyAddress;
import static com.google.gerrit.pgm.init.InitUtil.toURI;
import com.google.gerrit.pgm.init.api.ConsoleUI;
import com.google.gerrit.pgm.init.api.InitFlags;
import com.google.gerrit.pgm.init.api.InitStep;
import com.google.gerrit.pgm.init.api.Section;
import com.google.gerrit.server.config.SitePaths;
import com.google.gwtjsonrpc.server.SignedToken;
import com.google.inject.Inject;

4
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitIndex.java
View File

@@ -15,6 +15,10 @@
package com.google.gerrit.pgm.init;
import com.google.gerrit.lucene.LuceneChangeIndex;
import com.google.gerrit.pgm.init.api.ConsoleUI;
import com.google.gerrit.pgm.init.api.InitFlags;
import com.google.gerrit.pgm.init.api.InitStep;
import com.google.gerrit.pgm.init.api.Section;
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.index.ChangeSchemas;
import com.google.gerrit.server.index.IndexModule.IndexType;

3
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitLabels.java
View File

@@ -14,6 +14,9 @@
package com.google.gerrit.pgm.init;
import com.google.gerrit.pgm.init.api.AllProjectsConfig;
import com.google.gerrit.pgm.init.api.ConsoleUI;
import com.google.gerrit.pgm.init.api.InitStep;
import com.google.inject.Inject;
import com.google.inject.Singleton;

3
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitModule.java
View File

@@ -14,6 +14,9 @@
package com.google.gerrit.pgm.init;
import com.google.gerrit.pgm.init.api.InitFlags;
import com.google.gerrit.pgm.init.api.InitStep;
import com.google.gerrit.pgm.init.api.Section;
import com.google.gerrit.server.config.FactoryModule;
import com.google.gerrit.server.config.SitePaths;
import com.google.inject.binder.LinkedBindingBuilder;

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPluginStepsLoader.java
View File

@@ -16,6 +16,8 @@ package com.google.gerrit.pgm.init;
import com.google.common.base.Objects;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.pgm.init.api.ConsoleUI;
import com.google.gerrit.pgm.init.api.InitStep;
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.plugins.JarPluginProvider;
import com.google.gerrit.server.plugins.PluginLoader;

3
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java
View File

@@ -16,6 +16,9 @@ package com.google.gerrit.pgm.init;
import com.google.common.collect.Lists;
import com.google.gerrit.common.PluginData;
import com.google.gerrit.pgm.init.api.ConsoleUI;
import com.google.gerrit.pgm.init.api.InitFlags;
import com.google.gerrit.pgm.init.api.InitStep;
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.plugins.JarPluginProvider;
import com.google.inject.Inject;

3
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSendEmail.java
View File

@@ -17,6 +17,9 @@ package com.google.gerrit.pgm.init;
import static com.google.gerrit.pgm.init.InitUtil.isLocal;
import static com.google.gerrit.pgm.init.InitUtil.username;
import com.google.gerrit.pgm.init.api.ConsoleUI;
import com.google.gerrit.pgm.init.api.InitStep;
import com.google.gerrit.pgm.init.api.Section;
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.mail.SmtpEmailSender.Encryption;
import com.google.inject.Inject;

3
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSshd.java
View File

@@ -18,6 +18,9 @@ import static com.google.gerrit.common.FileUtil.chmod;
import static com.google.gerrit.pgm.init.InitUtil.die;
import static com.google.gerrit.pgm.init.InitUtil.hostname;
import com.google.gerrit.pgm.init.api.ConsoleUI;
import com.google.gerrit.pgm.init.api.InitStep;
import com.google.gerrit.pgm.init.api.Section;
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.util.SocketUtil;
import com.google.inject.Inject;

1
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/JDBCInitializer.java
View File

@@ -17,6 +17,7 @@ package com.google.gerrit.pgm.init;
import static com.google.gerrit.pgm.init.InitUtil.username;
import com.google.common.base.Strings;
import com.google.gerrit.pgm.init.api.Section;
class JDBCInitializer implements DatabaseConfigInitializer {
@Override

1
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/LibraryDownloader.java
View File

@@ -17,6 +17,7 @@ package com.google.gerrit.pgm.init;
import com.google.common.base.Strings;
import com.google.common.io.Files;
import com.google.gerrit.common.Die;
import com.google.gerrit.pgm.init.api.ConsoleUI;
import com.google.gerrit.pgm.util.IoUtil;
import com.google.gerrit.server.config.SitePaths;
import com.google.inject.Inject;

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/MaxDbInitializer.java
View File

@@ -16,6 +16,8 @@ package com.google.gerrit.pgm.init;
import static com.google.gerrit.pgm.init.InitUtil.username;
import com.google.gerrit.pgm.init.api.Section;
public class MaxDbInitializer implements DatabaseConfigInitializer {
@Override

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/MySqlInitializer.java
View File

@@ -16,6 +16,8 @@ package com.google.gerrit.pgm.init;
import static com.google.gerrit.pgm.init.InitUtil.username;
import com.google.gerrit.pgm.init.api.Section;
class MySqlInitializer implements DatabaseConfigInitializer {
@Override

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/OracleInitializer.java
View File

@@ -16,6 +16,8 @@ package com.google.gerrit.pgm.init;
import static com.google.gerrit.pgm.init.InitUtil.username;
import com.google.gerrit.pgm.init.api.Section;
public class OracleInitializer implements DatabaseConfigInitializer {

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/PostgreSQLInitializer.java
View File

@@ -16,6 +16,8 @@ package com.google.gerrit.pgm.init;
import static com.google.gerrit.pgm.init.InitUtil.username;
import com.google.gerrit.pgm.init.api.Section;
class PostgreSQLInitializer implements DatabaseConfigInitializer {
@Override

3
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java
View File

@@ -23,6 +23,9 @@ import static com.google.gerrit.pgm.init.InitUtil.saveSecure;
import static com.google.gerrit.pgm.init.InitUtil.version;
import com.google.gerrit.pgm.BaseInit;
import com.google.gerrit.pgm.init.api.ConsoleUI;
import com.google.gerrit.pgm.init.api.InitFlags;
import com.google.gerrit.pgm.init.api.InitStep;
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.mail.OutgoingEmail;
import com.google.inject.Binding;

4
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_x.java
View File

@@ -18,6 +18,10 @@ import static com.google.gerrit.pgm.init.InitUtil.die;
import static com.google.gerrit.pgm.init.InitUtil.savePublic;
import static com.google.gerrit.pgm.init.InitUtil.saveSecure;
import com.google.gerrit.pgm.init.api.ConsoleUI;
import com.google.gerrit.pgm.init.api.InitFlags;
import com.google.gerrit.pgm.init.api.InitStep;
import com.google.gerrit.pgm.init.api.Section;
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.util.SocketUtil;
import com.google.inject.Inject;

4
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/AllProjectsConfig.java → gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/AllProjectsConfig.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.pgm.init;
package com.google.gerrit.pgm.init.api;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.config.SitePaths;
@@ -93,7 +93,7 @@ public class AllProjectsConfig extends VersionedMetaData {
throw new UnsupportedOperationException();
}
void save(String message) throws IOException {
public void save(String message) throws IOException {
save(new PersonIdent("Gerrit Initialization", "init@gerrit"), message);
}

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/AllProjectsNameOnInitProvider.java → gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/AllProjectsNameOnInitProvider.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.pgm.init;
package com.google.gerrit.pgm.init.api;
import com.google.common.base.Objects;
import com.google.common.base.Strings;

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/ConsoleUI.java → gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/ConsoleUI.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.pgm.init;
package com.google.gerrit.pgm.init.api;
import static org.eclipse.jgit.util.StringUtils.equalsIgnoreCase;

7
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitFlags.java → gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/InitFlags.java
View File

@@ -12,8 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.pgm.init;
package com.google.gerrit.pgm.init.api;
import com.google.common.annotations.VisibleForTesting;
import com.google.gerrit.server.config.SitePaths;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -41,9 +42,9 @@ public class InitFlags {
public final FileBasedConfig sec;
public final List<String> installPlugins;
@VisibleForTesting
@Inject
InitFlags(final SitePaths site,
public InitFlags(final SitePaths site,
final @InstallPlugins List<String> installPlugins) throws IOException,
ConfigInvalidException {
this.installPlugins = installPlugins;

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitStep.java → gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/InitStep.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.pgm.init;
package com.google.gerrit.pgm.init.api;
/** A single step in the site initialization process. */
public interface InitStep {

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InstallPlugins.java → gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/InstallPlugins.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.pgm.init;
package com.google.gerrit.pgm.init.api;
import com.google.inject.BindingAnnotation;

4
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Section.java → gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/Section.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.pgm.init;
package com.google.gerrit.pgm.init.api;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.server.config.ConfigUtil;
@@ -49,7 +49,7 @@ public class Section {
this.subsection = subsection;
}
String get(String name) {
public String get(String name) {
return flags.cfg.getString(section, subsection, name);
}

1
gerrit-pgm/src/test/java/com/google/gerrit/pgm/init/LibrariesTest.java
View File

@@ -18,6 +18,7 @@ import static org.easymock.EasyMock.createStrictMock;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
import com.google.gerrit.pgm.init.api.ConsoleUI;
import com.google.gerrit.server.config.SitePaths;
import com.google.inject.Provider;

3
gerrit-pgm/src/test/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_xTest.java
View File

@@ -24,6 +24,9 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import com.google.gerrit.pgm.init.api.ConsoleUI;
import com.google.gerrit.pgm.init.api.InitFlags;
import com.google.gerrit.pgm.init.api.Section;
import com.google.gerrit.server.config.SitePaths;
import org.eclipse.jgit.errors.ConfigInvalidException;