Merge "fix critical sonar"

2 files changed, 96 insertions, 93 deletions

diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/util/IndentPrintWriter.java b/misc/env/src/main/java/org/onap/aaf/misc/env/util/IndentPrintWriter.java
index 77ee2676..203d361d 100644
--- a/misc/env/src/main/java/org/onap/aaf/misc/env/util/IndentPrintWriter.java
+++ b/misc/env/src/main/java/org/onap/aaf/misc/env/util/IndentPrintWriter.java
@@ -1,22 +1,15 @@
 /**

- * ============LICENSE_START====================================================

- * org.onap.aaf

- * ===========================================================================

- * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.

- * ===========================================================================

- * Licensed 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.

- * ============LICENSE_END====================================================

+ * ============LICENSE_START==================================================== org.onap.aaf

+ * =========================================================================== Copyright (c) 2018 AT&T Intellectual

+ * Property. All rights reserved. =========================================================================== Licensed

+ * 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. ============LICENSE_END====================================================

  */

 

 package org.onap.aaf.misc.env.util;

@@ -27,88 +20,98 @@ import java.io.Writer;
 

 /**

  * @author Jonathan

- * 

+ *

  *         Catch \n and indent according to current indent levels of JavaGen

  */

 public class IndentPrintWriter extends PrintWriter {

-	public static int INDENT = 2;

-	private boolean addIndent;

-	private int indent;

-	private int col;

-

-	public IndentPrintWriter(Writer out) {

-		super(out);

-		addIndent = false;

-		indent = col = 0;

-	}

-	

-	public IndentPrintWriter(OutputStream out) {

-		super(out);

-		addIndent = false;

-		indent = col = 0;

-	}

+

+    public static final int INDENT_MULTIPLIER = 2;

+    private boolean addIndent;

+    private int indent;

+    private int col;

+

+    public IndentPrintWriter(Writer out) {

+        super(out);

+        addIndent = false;

+        indent = col = 0;

+    }

+

+    public IndentPrintWriter(OutputStream out) {

+        super(out);

+        addIndent = false;

+        indent = col = 0;

+    }

 

 

+    @Override

     public void write(String str) {

-    	int len = str.length();

-		for(int i=0;i<len;++i) {

-			write((int)str.charAt(i));

-		}

+        int len = str.length();

+        for (int i = 0; i < len; ++i) {

+            write((int) str.charAt(i));

+        }

     }

-    

+

+    @Override

     public void println() {

-    	write((int)'\n');

+        write((int) '\n');

+    }

+

+    @Override

+    public void write(String str, int off, int len) {

+        int finalLength = Math.min(str.length(), off + len);

+        for (int i = off; i < finalLength; ++i) {

+            write((int) str.charAt(i));

+        }

+    }

+

+    @Override

+    public void write(int b) {

+        if (b == '\n') {

+            addIndent = true;

+            col = 0;

+        } else if (addIndent) {

+            addIndent = false;

+            toIndent();

+        } else {

+            ++col;

+        }

+        super.write(b);

+    }

+

+    @Override

+    public void write(char[] buf, int off, int len) {

+        for (int i = 0; i < len; ++i) {

+            write(buf[i] + off);

+        }

+    }

+

+    public void setIndent(int size) {

+        indent = size;

+    }

+

+    public void inc() {

+        ++indent;

+    }

+

+    public void dec() {

+        --indent;

+    }

+

+    public void toCol(int idx) {

+        while (idx > col++) {

+            super.write((int) ' ');

+        }

+    }

+

+    public int getIndent() {

+        return indent;

+    }

+

+    public void toIndent() {

+        int end = indent * INDENT_MULTIPLIER;

+        for (int i = 0; i < end; ++i) {

+            super.write((int) ' ');

+        }

+        col = end;

     }

-	public void write(String str, int off, int len)  {

-		len = Math.min(str.length(),off+len);

-		for(int i=off;i<len;++i) {

-			write((int)str.charAt(i));

-		}

-	}

-	public void write(int b) {

-		if (b == '\n') {

-			addIndent = true;

-			col = 0;

-		} else if (addIndent) {

-			addIndent = false;

-			toIndent();

-		} else {

-			++col;

-		}

-		super.write(b);

-	}

-

-	@Override

-	public void write(char[] buf, int off, int len) {

-		for (int i = 0; i < len; ++i)

-			write(buf[i] + off);

-	}

-

-	public void setIndent(int size) {

-		indent = size;

-	}

-

-	public void inc() {

-		++indent;

-	}

-	

-	public void dec() {

-		--indent;

-	}

-

-	public void toCol(int idx) {

-		while(idx>col++)super.write((int)' ');

-	}

-

-	public int getIndent() {

-		return indent;

-	}

-

-	public void toIndent() {

-		int end = indent * INDENT;

-		for (int i = 0; i < end; ++i) {

-			super.write((int) ' ');

-		}

-		col = end;

-	}

 }

diff --git a/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java b/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java
index c651d75b..4bb6ee28 100644
--- a/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java
+++ b/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java
@@ -112,7 +112,7 @@ public class XGen<RT extends XGen<RT>> {
 	

 		if(pretty) {

 			if(mark!=null && mark.comment!=null) {

-				int fi = forward.getIndent()*IndentPrintWriter.INDENT;

+				int fi = forward.getIndent()*IndentPrintWriter.INDENT_MULTIPLIER;

 				for(int i = fi+backSB.length();i<=COMMENT_COLUMN;++i) {

 					back.append(' ');

 				}