github
/
jgit
mirror of https://gitee.com/github-mirror-repo/jgit.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Extract inner classes from Config 

The Config class is getting very large. Extract two of its inner
classes into new top level types to reduce the size of Config.
Rename them slightly in the process.

Change-Id: I693148a5ae2977378789bf455c880a6fd856c0f0
stable-2.0
Shawn O. Pearce 13 years ago
parent
e0531ace35
commit
581e6ca2fe
3 changed files with 236 additions and 140 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 180
      org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java
  2. 128
      org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigLine.java
  3. 68
      org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigSnapshot.java

180
org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java
Unescape View File

@ -61,7 +61,6 @@ import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.errors.ConfigInvalidException;
@ -91,7 +90,7 @@ public class Config {
* This state is copy-on-write. It should always contain an immutable list * This state is copy-on-write. It should always contain an immutable list
* of the configuration keys/values. * of the configuration keys/values.
*/ */
private final AtomicReference<State> state; private final AtomicReference<ConfigSnapshot> state;
private final Config baseConfig; private final Config baseConfig;
@ -118,7 +117,7 @@ public class Config {
*/ */
public Config(Config defaultConfig) { public Config(Config defaultConfig) {
baseConfig = defaultConfig; baseConfig = defaultConfig;
state = new AtomicReference<State>(newState()); state = new AtomicReference<ConfigSnapshot>(newState());
} }
/** /**
@ -527,7 +526,7 @@ public class Config {
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public <T> T get(final SectionParser<T> parser) { public <T> T get(final SectionParser<T> parser) {
final State myState = getState(); final ConfigSnapshot myState = getState();
T obj = (T) myState.cache.get(parser); T obj = (T) myState.cache.get(parser);
if (obj == null) { if (obj == null) {
obj = parser.parse(this); obj = parser.parse(this);
@ -601,7 +600,7 @@ public class Config {
private List<String> getRawStringList(final String section, private List<String> getRawStringList(final String section,
final String subsection, final String name) { final String subsection, final String name) {
List<String> r = null; List<String> r = null;
for (final Entry e : state.get().entryList) { for (final ConfigLine e : state.get().entryList) {
if (e.match(section, subsection, name)) if (e.match(section, subsection, name))
r = add(r, e.value); r = add(r, e.value);
} }
@ -621,19 +620,19 @@ public class Config {
return curr; return curr;
} }
private State getState() { private ConfigSnapshot getState() {
State cur, upd; ConfigSnapshot cur, upd;
do { do {
cur = state.get(); cur = state.get();
final State base = getBaseState(); final ConfigSnapshot base = getBaseState();
if (cur.baseState == base) if (cur.baseState == base)
return cur; return cur;
upd = new State(cur.entryList, base); upd = new ConfigSnapshot(cur.entryList, base);
} while (!state.compareAndSet(cur, upd)); } while (!state.compareAndSet(cur, upd));
return upd; return upd;
} }
private State getBaseState() { private ConfigSnapshot getBaseState() {
return baseConfig != null ? baseConfig.getState() : null; return baseConfig != null ? baseConfig.getState() : null;
} }
@ -792,20 +791,21 @@ public class Config {
* optional subsection value, e.g. a branch name * optional subsection value, e.g. a branch name
*/ */
public void unsetSection(String section, String subsection) { public void unsetSection(String section, String subsection) {
State src, res; ConfigSnapshot src, res;
do { do {
src = state.get(); src = state.get();
res = unsetSection(src, section, subsection); res = unsetSection(src, section, subsection);
} while (!state.compareAndSet(src, res)); } while (!state.compareAndSet(src, res));
} }
private State unsetSection(final State srcState, final String section, private ConfigSnapshot unsetSection(final ConfigSnapshot srcState,
final String section,
final String subsection) { final String subsection) {
final int max = srcState.entryList.size(); final int max = srcState.entryList.size();
final ArrayList<Entry> r = new ArrayList<Entry>(max); final ArrayList<ConfigLine> r = new ArrayList<ConfigLine>(max);
boolean lastWasMatch = false; boolean lastWasMatch = false;
for (Entry e : srcState.entryList) { for (ConfigLine e : srcState.entryList) {
if (e.match(section, subsection)) { if (e.match(section, subsection)) {
// Skip this record, it's for the section we are removing. // Skip this record, it's for the section we are removing.
lastWasMatch = true; lastWasMatch = true;
@ -839,7 +839,7 @@ public class Config {
*/ */
public void setStringList(final String section, final String subsection, public void setStringList(final String section, final String subsection,
final String name, final List<String> values) { final String name, final List<String> values) {
State src, res; ConfigSnapshot src, res;
do { do {
src = state.get(); src = state.get();
res = replaceStringList(src, section, subsection, name, values); res = replaceStringList(src, section, subsection, name, values);
@ -848,10 +848,10 @@ public class Config {
fireConfigChangedEvent(); fireConfigChangedEvent();
} }
private State replaceStringList(final State srcState, private ConfigSnapshot replaceStringList(final ConfigSnapshot srcState,
final String section, final String subsection, final String name, final String section, final String subsection, final String name,
final List<String> values) { final List<String> values) {
final List<Entry> entries = copy(srcState, values); final List<ConfigLine> entries = copy(srcState, values);
int entryIndex = 0; int entryIndex = 0;
int valueIndex = 0; int valueIndex = 0;
int insertPosition = -1; int insertPosition = -1;
@ -859,7 +859,7 @@ public class Config {
// Reset the first n Entry objects that match this input name. // Reset the first n Entry objects that match this input name.
// //
while (entryIndex < entries.size() && valueIndex < values.size()) { while (entryIndex < entries.size() && valueIndex < values.size()) {
final Entry e = entries.get(entryIndex); final ConfigLine e = entries.get(entryIndex);
if (e.match(section, subsection, name)) { if (e.match(section, subsection, name)) {
entries.set(entryIndex, e.forValue(values.get(valueIndex++))); entries.set(entryIndex, e.forValue(values.get(valueIndex++)));
insertPosition = entryIndex + 1; insertPosition = entryIndex + 1;
@ -871,7 +871,7 @@ public class Config {
// //
if (valueIndex == values.size() && entryIndex < entries.size()) { if (valueIndex == values.size() && entryIndex < entries.size()) {
while (entryIndex < entries.size()) { while (entryIndex < entries.size()) {
final Entry e = entries.get(entryIndex++); final ConfigLine e = entries.get(entryIndex++);
if (e.match(section, subsection, name)) if (e.match(section, subsection, name))
entries.remove(--entryIndex); entries.remove(--entryIndex);
} }
@ -891,14 +891,14 @@ public class Config {
// We didn't find any matching section header for this key, // We didn't find any matching section header for this key,
// so we must create a new section header at the end. // so we must create a new section header at the end.
// //
final Entry e = new Entry(); final ConfigLine e = new ConfigLine();
e.section = section; e.section = section;
e.subsection = subsection; e.subsection = subsection;
entries.add(e); entries.add(e);
insertPosition = entries.size(); insertPosition = entries.size();
} }
while (valueIndex < values.size()) { while (valueIndex < values.size()) {
final Entry e = new Entry(); final ConfigLine e = new ConfigLine();
e.section = section; e.section = section;
e.subsection = subsection; e.subsection = subsection;
e.name = name; e.name = name;
@ -910,20 +910,21 @@ public class Config {
return newState(entries); return newState(entries);
} }
private static List<Entry> copy(final State src, final List<String> values) { private static List<ConfigLine> copy(final ConfigSnapshot src,
final List<String> values) {
// At worst we need to insert 1 line for each value, plus 1 line // At worst we need to insert 1 line for each value, plus 1 line
// for a new section header. Assume that and allocate the space. // for a new section header. Assume that and allocate the space.
// //
final int max = src.entryList.size() + values.size() + 1; final int max = src.entryList.size() + values.size() + 1;
final ArrayList<Entry> r = new ArrayList<Entry>(max); final ArrayList<ConfigLine> r = new ArrayList<ConfigLine>(max);
r.addAll(src.entryList); r.addAll(src.entryList);
return r; return r;
} }
private static int findSectionEnd(final List<Entry> entries, private static int findSectionEnd(final List<ConfigLine> entries,
final String section, final String subsection) { final String section, final String subsection) {
for (int i = 0; i < entries.size(); i++) { for (int i = 0; i < entries.size(); i++) {
Entry e = entries.get(i); ConfigLine e = entries.get(i);
if (e.match(section, subsection, null)) { if (e.match(section, subsection, null)) {
i++; i++;
while (i < entries.size()) { while (i < entries.size()) {
@ -944,7 +945,7 @@ public class Config {
*/ */
public String toText() { public String toText() {
final StringBuilder out = new StringBuilder(); final StringBuilder out = new StringBuilder();
for (final Entry e : state.get().entryList) { for (final ConfigLine e : state.get().entryList) {
if (e.prefix != null) if (e.prefix != null)
out.append(e.prefix); out.append(e.prefix);
if (e.section != null && e.name == null) { if (e.section != null && e.name == null) {
@ -994,10 +995,10 @@ public class Config {
* made to {@code this}. * made to {@code this}.
*/ */
public void fromText(final String text) throws ConfigInvalidException { public void fromText(final String text) throws ConfigInvalidException {
final List<Entry> newEntries = new ArrayList<Entry>(); final List<ConfigLine> newEntries = new ArrayList<ConfigLine>();
final StringReader in = new StringReader(text); final StringReader in = new StringReader(text);
Entry last = null; ConfigLine last = null;
Entry e = new Entry(); ConfigLine e = new ConfigLine();
for (;;) { for (;;) {
int input = in.read(); int input = in.read();
if (-1 == input) if (-1 == input)
@ -1009,7 +1010,7 @@ public class Config {
newEntries.add(e); newEntries.add(e);
if (e.section != null) if (e.section != null)
last = e; last = e;
e = new Entry(); e = new ConfigLine();
} else if (e.suffix != null) { } else if (e.suffix != null) {
// Everything up until the end-of-line is in the suffix. // Everything up until the end-of-line is in the suffix.
@ -1056,12 +1057,14 @@ public class Config {
state.set(newState(newEntries)); state.set(newState(newEntries));
} }
private State newState() { private ConfigSnapshot newState() {
return new State(Collections.<Entry> emptyList(), getBaseState()); return new ConfigSnapshot(Collections.<ConfigLine> emptyList(),
getBaseState());
} }
private State newState(final List<Entry> entries) { private ConfigSnapshot newState(final List<ConfigLine> entries) {
return new State(Collections.unmodifiableList(entries), getBaseState()); return new ConfigSnapshot(Collections.unmodifiableList(entries),
getBaseState());
} }
/** /**
@ -1279,7 +1282,7 @@ public class Config {
public Set<String> parse(Config cfg) { public Set<String> parse(Config cfg) {
final Set<String> result = new LinkedHashSet<String>(); final Set<String> result = new LinkedHashSet<String>();
while (cfg != null) { while (cfg != null) {
for (final Entry e : cfg.state.get().entryList) { for (final ConfigLine e : cfg.state.get().entryList) {
if (e.subsection != null && e.name == null if (e.subsection != null && e.name == null
&& StringUtils.equalsIgnoreCase(section, e.section)) && StringUtils.equalsIgnoreCase(section, e.section))
result.add(e.subsection); result.add(e.subsection);
@ -1332,7 +1335,7 @@ public class Config {
public Set<String> parse(Config cfg) { public Set<String> parse(Config cfg) {
final Map<String, String> m = new LinkedHashMap<String, String>(); final Map<String, String> m = new LinkedHashMap<String, String>();
while (cfg != null) { while (cfg != null) {
for (final Entry e : cfg.state.get().entryList) { for (final ConfigLine e : cfg.state.get().entryList) {
if (e.name == null) if (e.name == null)
continue; continue;
if (!StringUtils.equalsIgnoreCase(section, e.section)) if (!StringUtils.equalsIgnoreCase(section, e.section))
@ -1355,7 +1358,7 @@ public class Config {
public Set<String> parse(Config cfg) { public Set<String> parse(Config cfg) {
final Map<String, String> m = new LinkedHashMap<String, String>(); final Map<String, String> m = new LinkedHashMap<String, String>();
while (cfg != null) { while (cfg != null) {
for (final Entry e : cfg.state.get().entryList) { for (final ConfigLine e : cfg.state.get().entryList) {
if (e.section != null) { if (e.section != null) {
String lc = StringUtils.toLowerCase(e.section); String lc = StringUtils.toLowerCase(e.section);
if (!m.containsKey(lc)) if (!m.containsKey(lc))
@ -1396,109 +1399,6 @@ public class Config {
} }
} }
private static class State {
final List<Entry> entryList;
final Map<Object, Object> cache;
final State baseState;
State(List<Entry> entries, State base) {
entryList = entries;
cache = new ConcurrentHashMap<Object, Object>(16, 0.75f, 1);
baseState = base;
}
}
/**
* The configuration file entry
*/
private static class Entry {
/**
* The text content before entry
*/
String prefix;
/**
* The section name for the entry
*/
String section;
/**
* Subsection name
*/
String subsection;
/**
* The key name
*/
String name;
/**
* The value
*/
String value;
/**
* The text content after entry
*/
String suffix;
Entry forValue(final String newValue) {
final Entry e = new Entry();
e.prefix = prefix;
e.section = section;
e.subsection = subsection;
e.name = name;
e.value = newValue;
e.suffix = suffix;
return e;
}
boolean match(final String aSection, final String aSubsection,
final String aKey) {
return eqIgnoreCase(section, aSection)
&& eqSameCase(subsection, aSubsection)
&& eqIgnoreCase(name, aKey);
}
boolean match(final String aSection, final String aSubsection) {
return eqIgnoreCase(section, aSection)
&& eqSameCase(subsection, aSubsection);
}
private static boolean eqIgnoreCase(final String a, final String b) {
if (a == null && b == null)
return true;
if (a == null || b == null)
return false;
return StringUtils.equalsIgnoreCase(a, b);
}
private static boolean eqSameCase(final String a, final String b) {
if (a == null && b == null)
return true;
if (a == null || b == null)
return false;
return a.equals(b);
}
@Override
public String toString() {
if (section == null)
return "<empty>";
StringBuilder b = new StringBuilder(section);
if (subsection != null)
b.append(".").append(subsection);
if (name != null)
b.append(".").append(name);
if (value != null)
b.append("=").append(value);
return b.toString();
}
}
private static class StringReader { private static class StringReader {
private final char[] buf; private final char[] buf;

128
org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigLine.java
Unescape View File

@ -0,0 +1,128 @@
/*
* Copyright (C) 2010, Mathias Kinzler <mathias.kinzler@sap.com>
* Copyright (C) 2009, Constantine Plotnikov <constantine.plotnikov@gmail.com>
* Copyright (C) 2007, Dave Watson <dwatson@mimvista.com>
* Copyright (C) 2008-2010, Google Inc.
* Copyright (C) 2009, Google, Inc.
* Copyright (C) 2009, JetBrains s.r.o.
* Copyright (C) 2007-2008, Robin Rosenberg <robin.rosenberg@dewire.com>
* Copyright (C) 2006-2008, Shawn O. Pearce <spearce@spearce.org>
* Copyright (C) 2008, Thad Hughes <thadh@thad.corp.google.com>
* and other copyright owners as documented in the project's IP log.
*
* This program and the accompanying materials are made available
* under the terms of the Eclipse Distribution License v1.0 which
* accompanies this distribution, is reproduced below, and is
* available at http://www.eclipse.org/org/documents/edl-v10.php
*
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
*
* - Neither the name of the Eclipse Foundation, Inc. nor the
* names of its contributors may be used to endorse or promote
* products derived from this software without specific prior
* written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.eclipse.jgit.lib;
import org.eclipse.jgit.util.StringUtils;
/** A line in a Git {@link Config} file. */
class ConfigLine {
/** The text content before entry. */
String prefix;
/** The section name for the entry. */
String section;
/** Subsection name. */
String subsection;
/** The key name. */
String name;
/** The value. */
String value;
/** The text content after entry. */
String suffix;
ConfigLine forValue(final String newValue) {
final ConfigLine e = new ConfigLine();
e.prefix = prefix;
e.section = section;
e.subsection = subsection;
e.name = name;
e.value = newValue;
e.suffix = suffix;
return e;
}
boolean match(final String aSection, final String aSubsection,
final String aKey) {
return eqIgnoreCase(section, aSection)
&& eqSameCase(subsection, aSubsection)
&& eqIgnoreCase(name, aKey);
}
boolean match(final String aSection, final String aSubsection) {
return eqIgnoreCase(section, aSection)
&& eqSameCase(subsection, aSubsection);
}
private static boolean eqIgnoreCase(final String a, final String b) {
if (a == null && b == null)
return true;
if (a == null || b == null)
return false;
return StringUtils.equalsIgnoreCase(a, b);
}
private static boolean eqSameCase(final String a, final String b) {
if (a == null && b == null)
return true;
if (a == null || b == null)
return false;
return a.equals(b);
}
@Override
public String toString() {
if (section == null)
return "<empty>";
StringBuilder b = new StringBuilder(section);
if (subsection != null)
b.append(".").append(subsection);
if (name != null)
b.append(".").append(name);
if (value != null)
b.append("=").append(value);
return b.toString();
}
}

68
org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigSnapshot.java
Unescape View File

@ -0,0 +1,68 @@
/*
* Copyright (C) 2010, Mathias Kinzler <mathias.kinzler@sap.com>
* Copyright (C) 2009, Constantine Plotnikov <constantine.plotnikov@gmail.com>
* Copyright (C) 2007, Dave Watson <dwatson@mimvista.com>
* Copyright (C) 2008-2010, Google Inc.
* Copyright (C) 2009, Google, Inc.
* Copyright (C) 2009, JetBrains s.r.o.
* Copyright (C) 2007-2008, Robin Rosenberg <robin.rosenberg@dewire.com>
* Copyright (C) 2006-2008, Shawn O. Pearce <spearce@spearce.org>
* Copyright (C) 2008, Thad Hughes <thadh@thad.corp.google.com>
* and other copyright owners as documented in the project's IP log.
*
* This program and the accompanying materials are made available
* under the terms of the Eclipse Distribution License v1.0 which
* accompanies this distribution, is reproduced below, and is
* available at http://www.eclipse.org/org/documents/edl-v10.php
*
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or
* without modification, are permitted provided that the following
* conditions are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
*
* - Neither the name of the Eclipse Foundation, Inc. nor the
* names of its contributors may be used to endorse or promote
* products derived from this software without specific prior
* written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.eclipse.jgit.lib;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
class ConfigSnapshot {
final List<ConfigLine> entryList;
final Map<Object, Object> cache;
final ConfigSnapshot baseState;
ConfigSnapshot(List<ConfigLine> entries, ConfigSnapshot base) {
entryList = entries;
cache = new ConcurrentHashMap<Object, Object>(16, 0.75f, 1);
baseState = base;
}
}
Write Preview
Loading…
Cancel
Save