You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/06/27 09:29:05 UTC
[1/2] logging-log4j2 git commit: Better name for private var.
Repository: logging-log4j2
Updated Branches:
refs/heads/master aa8ff1dbb -> 14414fbfd
Better name for private var.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/66e140e1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/66e140e1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/66e140e1
Branch: refs/heads/master
Commit: 66e140e1b1e2b4db0cd2c0840ecf998ae7118a57
Parents: aa8ff1d
Author: ggregory <gg...@apache.org>
Authored: Sat Jun 27 00:28:27 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Sat Jun 27 00:28:27 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/message/StructuredDataId.java | 388 +++++++++----------
1 file changed, 194 insertions(+), 194 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/66e140e1/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
index a200b57..81f48dc 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
@@ -1,194 +1,194 @@
-/*
- * 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.logging.log4j.message;
-
-import java.io.Serializable;
-
-import org.apache.logging.log4j.util.Strings;
-
-/**
- * The StructuredData identifier.
- */
-public class StructuredDataId implements Serializable {
-
- private static final String AT = "@";
-
- /**
- * RFC 5424 Time Quality.
- */
- public static final StructuredDataId TIME_QUALITY = new StructuredDataId("timeQuality", null,
- new String[]{"tzKnown", "isSynced", "syncAccuracy"});
-
- /**
- * RFC 5424 Origin.
- */
- public static final StructuredDataId ORIGIN = new StructuredDataId("origin", null,
- new String[]{"ip", "enterpriseId", "software", "swVersion"});
-
- /**
- * RFC 5424 Meta.
- */
- public static final StructuredDataId META = new StructuredDataId("meta", null,
- new String[]{"sequenceId", "sysUpTime", "language"});
-
- /**
- * Reserved enterprise number.
- */
- public static final int RESERVED = -1;
-
- private static final long serialVersionUID = 9031746276396249990L;
- private static final int MAX_LENGTH = 32;
-
- private final String name;
- private final int enterpriseNumber;
- private final String[] required;
- private final String[] optional;
-
-
- protected StructuredDataId(final String name, final String[] required, final String[] optional) {
- int index = -1;
- if (name != null) {
- if (name.length() > MAX_LENGTH) {
- throw new IllegalArgumentException(String.format("Length of id %s exceeds maximum of %d characters",
- name, MAX_LENGTH));
- }
- index = name.indexOf(AT);
- }
-
- if (index > 0) {
- this.name = name.substring(0, index);
- this.enterpriseNumber = Integer.parseInt(name.substring(index + 1));
- } else {
- this.name = name;
- this.enterpriseNumber = RESERVED;
- }
- this.required = required;
- this.optional = optional;
- }
-
- /**
- * A Constructor that helps conformance to RFC 5424.
- *
- * @param name The name portion of the id.
- * @param enterpriseNumber The enterprise number.
- * @param required The list of keys that are required for this id.
- * @param optional The list of keys that are optional for this id.
- */
- public StructuredDataId(final String name, final int enterpriseNumber, final String[] required,
- final String[] optional) {
- if (name == null) {
- throw new IllegalArgumentException("No structured id name was supplied");
- }
- if (name.contains(AT)) {
- throw new IllegalArgumentException("Structured id name cannot contain an " + Strings.quote(AT));
- }
- if (enterpriseNumber <= 0) {
- throw new IllegalArgumentException("No enterprise number was supplied");
- }
- this.name = name;
- this.enterpriseNumber = enterpriseNumber;
- final String id = enterpriseNumber < 0 ? name : name + AT + enterpriseNumber;
- if (id.length() > MAX_LENGTH) {
- throw new IllegalArgumentException("Length of id exceeds maximum of 32 characters: " + id);
- }
- this.required = required;
- this.optional = optional;
- }
-
- /**
- * Creates an id using another id to supply default values.
- * @param id The original StructuredDataId.
- * @return the new StructuredDataId.
- */
- public StructuredDataId makeId(final StructuredDataId id) {
- if (id == null) {
- return this;
- }
- return makeId(id.getName(), id.getEnterpriseNumber());
- }
-
- /**
- * Creates an id based on the current id.
- * @param defaultId The default id to use if this StructuredDataId doesn't have a name.
- * @param enterpriseNumber The enterprise number.
- * @return a StructuredDataId.
- */
- public StructuredDataId makeId(final String defaultId, final int enterpriseNumber) {
- String id;
- String[] req;
- String[] opt;
- if (enterpriseNumber <= 0) {
- return this;
- }
- if (this.name != null) {
- id = this.name;
- req = this.required;
- opt = this.optional;
- } else {
- id = defaultId;
- req = null;
- opt = null;
- }
-
- return new StructuredDataId(id, enterpriseNumber, req, opt);
- }
-
- /**
- * Returns a list of required keys.
- * @return a List of required keys or null if none have been provided.
- */
- public String[] getRequired() {
- return required;
- }
-
- /**
- * Returns a list of optional keys.
- * @return a List of optional keys or null if none have been provided.
- */
- public String[] getOptional() {
- return optional;
- }
-
- /**
- * Returns the StructuredDataId name.
- * @return the StructuredDataId name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * Returns the enterprise number.
- * @return the enterprise number.
- */
- public int getEnterpriseNumber() {
- return enterpriseNumber;
- }
-
- /**
- * Indicates if the id is reserved.
- * @return true if the id uses the reserved enterprise number, false otherwise.
- */
- public boolean isReserved() {
- return enterpriseNumber <= 0;
- }
-
- @Override
- public String toString() {
- return isReserved() ? name : name + AT + enterpriseNumber;
- }
-}
+/*
+ * 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.logging.log4j.message;
+
+import java.io.Serializable;
+
+import org.apache.logging.log4j.util.Strings;
+
+/**
+ * The StructuredData identifier.
+ */
+public class StructuredDataId implements Serializable {
+
+ private static final String AT_SIGN = "@";
+
+ /**
+ * RFC 5424 Time Quality.
+ */
+ public static final StructuredDataId TIME_QUALITY = new StructuredDataId("timeQuality", null,
+ new String[]{"tzKnown", "isSynced", "syncAccuracy"});
+
+ /**
+ * RFC 5424 Origin.
+ */
+ public static final StructuredDataId ORIGIN = new StructuredDataId("origin", null,
+ new String[]{"ip", "enterpriseId", "software", "swVersion"});
+
+ /**
+ * RFC 5424 Meta.
+ */
+ public static final StructuredDataId META = new StructuredDataId("meta", null,
+ new String[]{"sequenceId", "sysUpTime", "language"});
+
+ /**
+ * Reserved enterprise number.
+ */
+ public static final int RESERVED = -1;
+
+ private static final long serialVersionUID = 9031746276396249990L;
+ private static final int MAX_LENGTH = 32;
+
+ private final String name;
+ private final int enterpriseNumber;
+ private final String[] required;
+ private final String[] optional;
+
+
+ protected StructuredDataId(final String name, final String[] required, final String[] optional) {
+ int index = -1;
+ if (name != null) {
+ if (name.length() > MAX_LENGTH) {
+ throw new IllegalArgumentException(String.format("Length of id %s exceeds maximum of %d characters",
+ name, MAX_LENGTH));
+ }
+ index = name.indexOf(AT_SIGN);
+ }
+
+ if (index > 0) {
+ this.name = name.substring(0, index);
+ this.enterpriseNumber = Integer.parseInt(name.substring(index + 1));
+ } else {
+ this.name = name;
+ this.enterpriseNumber = RESERVED;
+ }
+ this.required = required;
+ this.optional = optional;
+ }
+
+ /**
+ * A Constructor that helps conformance to RFC 5424.
+ *
+ * @param name The name portion of the id.
+ * @param enterpriseNumber The enterprise number.
+ * @param required The list of keys that are required for this id.
+ * @param optional The list of keys that are optional for this id.
+ */
+ public StructuredDataId(final String name, final int enterpriseNumber, final String[] required,
+ final String[] optional) {
+ if (name == null) {
+ throw new IllegalArgumentException("No structured id name was supplied");
+ }
+ if (name.contains(AT_SIGN)) {
+ throw new IllegalArgumentException("Structured id name cannot contain an " + Strings.quote(AT_SIGN));
+ }
+ if (enterpriseNumber <= 0) {
+ throw new IllegalArgumentException("No enterprise number was supplied");
+ }
+ this.name = name;
+ this.enterpriseNumber = enterpriseNumber;
+ final String id = enterpriseNumber < 0 ? name : name + AT_SIGN + enterpriseNumber;
+ if (id.length() > MAX_LENGTH) {
+ throw new IllegalArgumentException("Length of id exceeds maximum of 32 characters: " + id);
+ }
+ this.required = required;
+ this.optional = optional;
+ }
+
+ /**
+ * Creates an id using another id to supply default values.
+ * @param id The original StructuredDataId.
+ * @return the new StructuredDataId.
+ */
+ public StructuredDataId makeId(final StructuredDataId id) {
+ if (id == null) {
+ return this;
+ }
+ return makeId(id.getName(), id.getEnterpriseNumber());
+ }
+
+ /**
+ * Creates an id based on the current id.
+ * @param defaultId The default id to use if this StructuredDataId doesn't have a name.
+ * @param enterpriseNumber The enterprise number.
+ * @return a StructuredDataId.
+ */
+ public StructuredDataId makeId(final String defaultId, final int enterpriseNumber) {
+ String id;
+ String[] req;
+ String[] opt;
+ if (enterpriseNumber <= 0) {
+ return this;
+ }
+ if (this.name != null) {
+ id = this.name;
+ req = this.required;
+ opt = this.optional;
+ } else {
+ id = defaultId;
+ req = null;
+ opt = null;
+ }
+
+ return new StructuredDataId(id, enterpriseNumber, req, opt);
+ }
+
+ /**
+ * Returns a list of required keys.
+ * @return a List of required keys or null if none have been provided.
+ */
+ public String[] getRequired() {
+ return required;
+ }
+
+ /**
+ * Returns a list of optional keys.
+ * @return a List of optional keys or null if none have been provided.
+ */
+ public String[] getOptional() {
+ return optional;
+ }
+
+ /**
+ * Returns the StructuredDataId name.
+ * @return the StructuredDataId name.
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Returns the enterprise number.
+ * @return the enterprise number.
+ */
+ public int getEnterpriseNumber() {
+ return enterpriseNumber;
+ }
+
+ /**
+ * Indicates if the id is reserved.
+ * @return true if the id uses the reserved enterprise number, false otherwise.
+ */
+ public boolean isReserved() {
+ return enterpriseNumber <= 0;
+ }
+
+ @Override
+ public String toString() {
+ return isReserved() ? name : name + AT_SIGN + enterpriseNumber;
+ }
+}
[2/2] logging-log4j2 git commit: Useless condition: it's known that
enterpriseNumber >= 0 at this point.
Posted by gg...@apache.org.
Useless condition: it's known that enterpriseNumber >= 0 at this point.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/14414fbf
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/14414fbf
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/14414fbf
Branch: refs/heads/master
Commit: 14414fbfd0f62b528e12b546a7c92f406cf0e1ba
Parents: 66e140e
Author: ggregory <gg...@apache.org>
Authored: Sat Jun 27 00:29:01 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Sat Jun 27 00:29:01 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/message/StructuredDataId.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/14414fbf/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
index 81f48dc..606d16e 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
@@ -101,7 +101,7 @@ public class StructuredDataId implements Serializable {
}
this.name = name;
this.enterpriseNumber = enterpriseNumber;
- final String id = enterpriseNumber < 0 ? name : name + AT_SIGN + enterpriseNumber;
+ final String id = name + AT_SIGN + enterpriseNumber;
if (id.length() > MAX_LENGTH) {
throw new IllegalArgumentException("Length of id exceeds maximum of 32 characters: " + id);
}