You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by co...@apache.org on 2015/02/04 17:28:15 UTC
[2/4] directory-kerberos git commit: Removing tabs
Removing tabs
Project: http://git-wip-us.apache.org/repos/asf/directory-kerberos/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerberos/commit/e4db3006
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerberos/tree/e4db3006
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerberos/diff/e4db3006
Branch: refs/heads/master
Commit: e4db3006035465966d24f99ea92d0c7aaf21772f
Parents: ac8f3e9
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Feb 4 15:06:12 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Feb 4 15:06:12 2015 +0000
----------------------------------------------------------------------
.../kerby/kerberos/kerb/KrbOutputStream.java | 12 +--
.../kerb/ccache/CredCacheOutputStream.java | 54 ++++++------
.../kerb/keytab/KeytabOutputStream.java | 4 +-
.../main/java/org/apache/kerby/config/Conf.java | 10 +--
.../org/apache/kerby/config/ConfigObject.java | 88 ++++++++++----------
5 files changed, 84 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/e4db3006/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/KrbOutputStream.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/KrbOutputStream.java b/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/KrbOutputStream.java
index 7be0bdf..828d93f 100644
--- a/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/KrbOutputStream.java
+++ b/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/KrbOutputStream.java
@@ -29,7 +29,7 @@ import java.io.OutputStream;
public abstract class KrbOutputStream extends DataOutputStream
{
- public KrbOutputStream(OutputStream out) {
+ public KrbOutputStream(OutputStream out) {
super(out);
}
@@ -42,11 +42,11 @@ public abstract class KrbOutputStream extends DataOutputStream
public abstract void writeKey(EncryptionKey key, int version) throws IOException;
public void writeTime(KerberosTime ktime) throws IOException {
- int time = 0;
- if (ktime != null) {
- time = (int) (ktime.getValue().getTime() / 1000);
- }
- writeInt(time);
+ int time = 0;
+ if (ktime != null) {
+ time = (int) (ktime.getValue().getTime() / 1000);
+ }
+ writeInt(time);
}
public void writeCountedString(String string) throws IOException {
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/e4db3006/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/CredCacheOutputStream.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/CredCacheOutputStream.java b/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/CredCacheOutputStream.java
index 30fcd82..e5bd5f7 100644
--- a/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/CredCacheOutputStream.java
+++ b/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/CredCacheOutputStream.java
@@ -31,7 +31,7 @@ import java.util.List;
public class CredCacheOutputStream extends KrbOutputStream
{
- public CredCacheOutputStream(OutputStream out) {
+ public CredCacheOutputStream(OutputStream out) {
super(out);
}
@@ -39,8 +39,8 @@ public class CredCacheOutputStream extends KrbOutputStream
public void writePrincipal(PrincipalName principal, int version) throws IOException {
List<String> nameComponents = principal.getNameStrings();
- if (version != CredentialCache.FCC_FVNO_1) {
- writeInt(principal.getNameType().getValue());
+ if (version != CredentialCache.FCC_FVNO_1) {
+ writeInt(principal.getNameType().getValue());
}
int numComponents = nameComponents.size();
@@ -48,9 +48,9 @@ public class CredCacheOutputStream extends KrbOutputStream
numComponents ++;
}
writeInt(numComponents);
-
+
writeRealm(principal.getRealm());
-
+
for (String nameCom : nameComponents) {
writeCountedString(nameCom);
}
@@ -58,10 +58,10 @@ public class CredCacheOutputStream extends KrbOutputStream
@Override
public void writeKey(EncryptionKey key, int version) throws IOException {
- writeShort(key.getKeyType().getValue());
- if (version == CredentialCache.FCC_FVNO_3) {
- writeShort(key.getKeyType().getValue());
- }
+ writeShort(key.getKeyType().getValue());
+ if (version == CredentialCache.FCC_FVNO_3) {
+ writeShort(key.getKeyType().getValue());
+ }
writeCountedOctets(key.getKeyData());
}
@@ -73,36 +73,36 @@ public class CredCacheOutputStream extends KrbOutputStream
}
public void writeAddresses(HostAddresses addrs) throws IOException {
- if (addrs == null) {
- writeInt(0);
- } else {
+ if (addrs == null) {
+ writeInt(0);
+ } else {
List<HostAddress> addresses = addrs.getElements();
- write(addresses.size());
- for (HostAddress addr : addresses) {
+ write(addresses.size());
+ for (HostAddress addr : addresses) {
writeAddress(addr);
- }
- }
+ }
+ }
}
public void writeAddress(HostAddress address) throws IOException {
write(address.getAddrType().getValue());
write(address.getAddress().length);
write(address.getAddress(), 0,
- address.getAddress().length);
+ address.getAddress().length);
}
public void writeAuthzData(AuthorizationData authData) throws IOException {
- if (authData == null) {
- writeInt(0);
- } else {
- for (AuthorizationDataEntry entry : authData.getElements()) {
- write(entry.getAuthzType().getValue());
- write(entry.getAuthzData().length);
- write(entry.getAuthzData());
- }
- }
+ if (authData == null) {
+ writeInt(0);
+ } else {
+ for (AuthorizationDataEntry entry : authData.getElements()) {
+ write(entry.getAuthzType().getValue());
+ write(entry.getAuthzData().length);
+ write(entry.getAuthzData());
+ }
+ }
}
-
+
public void writeTicket(Ticket t) throws IOException {
if (t == null) {
writeInt(0);
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/e4db3006/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/keytab/KeytabOutputStream.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/keytab/KeytabOutputStream.java b/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/keytab/KeytabOutputStream.java
index d69308f..935956d 100644
--- a/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/keytab/KeytabOutputStream.java
+++ b/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/keytab/KeytabOutputStream.java
@@ -29,7 +29,7 @@ import java.util.List;
public class KeytabOutputStream extends KrbOutputStream
{
- public KeytabOutputStream(OutputStream out) {
+ public KeytabOutputStream(OutputStream out) {
super(out);
}
@@ -51,7 +51,7 @@ public class KeytabOutputStream extends KrbOutputStream
@Override
public void writeKey(EncryptionKey key, int version) throws IOException {
- writeShort(key.getKeyType().getValue());
+ writeShort(key.getKeyType().getValue());
writeCountedOctets(key.getKeyData());
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/e4db3006/lib/kerby-config/src/main/java/org/apache/kerby/config/Conf.java
----------------------------------------------------------------------
diff --git a/lib/kerby-config/src/main/java/org/apache/kerby/config/Conf.java b/lib/kerby-config/src/main/java/org/apache/kerby/config/Conf.java
index b1afe50..b426c02 100644
--- a/lib/kerby-config/src/main/java/org/apache/kerby/config/Conf.java
+++ b/lib/kerby-config/src/main/java/org/apache/kerby/config/Conf.java
@@ -29,19 +29,19 @@ import java.util.*;
public class Conf implements Config {
private static final Logger logger = LoggerFactory.getLogger(Conf.class);
- private List<ConfigLoader> resourceConfigs;
+ private List<ConfigLoader> resourceConfigs;
private final ConfigImpl config;
private boolean needReload;
- public Conf() {
+ public Conf() {
this.resourceConfigs = new ArrayList<ConfigLoader>(1);
this.config = new ConfigImpl("Conf");
this.needReload = true;
- }
+ }
- public void addXmlConfig(File xmlFile) throws IOException {
+ public void addXmlConfig(File xmlFile) throws IOException {
addResource(Resource.createXmlResource(xmlFile));
- }
+ }
public void addIniConfig(File iniFile) throws IOException {
addResource(Resource.createIniResource(iniFile));
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/e4db3006/lib/kerby-config/src/main/java/org/apache/kerby/config/ConfigObject.java
----------------------------------------------------------------------
diff --git a/lib/kerby-config/src/main/java/org/apache/kerby/config/ConfigObject.java b/lib/kerby-config/src/main/java/org/apache/kerby/config/ConfigObject.java
index 536af3e..3d0cc17 100644
--- a/lib/kerby-config/src/main/java/org/apache/kerby/config/ConfigObject.java
+++ b/lib/kerby-config/src/main/java/org/apache/kerby/config/ConfigObject.java
@@ -23,25 +23,25 @@ import java.util.ArrayList;
import java.util.List;
public class ConfigObject {
- protected static enum VALUE_TYPE { PROPERTY, LIST, CONFIG };
-
- private VALUE_TYPE valueType;
- private Object value;
-
- public ConfigObject(String value) {
- this.value = value;
- this.valueType = VALUE_TYPE.PROPERTY;
- }
-
- public ConfigObject(String[] values) {
- List<String> valuesList = new ArrayList<String>();
- for (String v : values) {
- valuesList.add(v);
- }
+ protected static enum VALUE_TYPE { PROPERTY, LIST, CONFIG };
- this.value = valuesList;
- this.valueType = VALUE_TYPE.LIST;
- }
+ private VALUE_TYPE valueType;
+ private Object value;
+
+ public ConfigObject(String value) {
+ this.value = value;
+ this.valueType = VALUE_TYPE.PROPERTY;
+ }
+
+ public ConfigObject(String[] values) {
+ List<String> valuesList = new ArrayList<String>();
+ for (String v : values) {
+ valuesList.add(v);
+ }
+
+ this.value = valuesList;
+ this.valueType = VALUE_TYPE.LIST;
+ }
public ConfigObject(List<String> values) {
if (values != null) {
@@ -52,34 +52,34 @@ public class ConfigObject {
this.valueType = VALUE_TYPE.LIST;
}
- public ConfigObject(Config value) {
- this.value = value;
- this.valueType = VALUE_TYPE.CONFIG;
- }
+ public ConfigObject(Config value) {
+ this.value = value;
+ this.valueType = VALUE_TYPE.CONFIG;
+ }
+
+ public String getPropertyValue() {
+ String result = null;
+ if (valueType == VALUE_TYPE.PROPERTY) {
+ result = (String) value;
+ }
+ return result;
+ }
- public String getPropertyValue() {
- String result = null;
- if (valueType == VALUE_TYPE.PROPERTY) {
- result = (String) value;
- }
- return result;
- }
-
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked")
public List<String> getListValues() {
- List<String> results = null;
- if (valueType == VALUE_TYPE.LIST && value instanceof List<?>) {
+ List<String> results = null;
+ if (valueType == VALUE_TYPE.LIST && value instanceof List<?>) {
results = (List<String>) value;
- }
-
- return results;
- }
+ }
- public Config getConfigValue() {
- Config result = null;
- if (valueType == VALUE_TYPE.CONFIG) {
- result = (Config) value;
- }
- return result;
- }
+ return results;
+ }
+
+ public Config getConfigValue() {
+ Config result = null;
+ if (valueType == VALUE_TYPE.CONFIG) {
+ result = (Config) value;
+ }
+ return result;
+ }
}