summaryrefslogtreecommitdiffstats
path: root/auth/auth-batch
diff options
context:
space:
mode:
authorJonathan Gathman <jonathan.gathman@att.com>2019-01-22 12:14:52 +0000
committerGerrit Code Review <gerrit@onap.org>2019-01-22 12:14:52 +0000
commitca4b57d66a602ac94eba93bd3ab9106406575882 (patch)
tree118a2f40511c6af8bb56c8174a1b2124b76cdb08 /auth/auth-batch
parent4d121bbc162183ef65eab5ad273dac2265d43628 (diff)
parentd2fb28d4bc014853abc831fb68cbf3bfb36169ea (diff)
Merge "Sonar fix: History.java"
Diffstat (limited to 'auth/auth-batch')
-rw-r--r--auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/History.java117
1 files changed, 59 insertions, 58 deletions
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/History.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/History.java
index a172738c..0a50ae0b 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/History.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/History.java
@@ -3,6 +3,8 @@
* org.onap.aaf
* ===========================================================================
* Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ *
+ * Modifications Copyright (C) 2018 IBM.
* ===========================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -43,9 +45,60 @@ public class History {
public final String subject;
public final String target;
public final String user;
- public final int yr_mon;
+ public final int yrMon;
+
+ public static Creator<History> sansConstruct = new Creator<History> () {
+ @Override
+ public History create(Row row) {
+ return new History(
+ row.getUUID(0),
+ row.getString(1),
+ row.getString(2),
+ row.getString(3),
+ row.getString(4),
+ row.getString(5),
+ row.getInt(6));
+ }
+
+ @Override
+ public String select() {
+ return "SELECT id, action, memo, subject, target, user, yr_mon from authz.history LIMIT 10000000 ";
+ }
+ };
+
+ public static Creator<History> avecConstruct = new Creator<History> () {
+ private final StringBuilder sb = new StringBuilder();
+
+ @Override
+ public History create(Row row) {
+ ByteBuffer bb = row.getBytes(3);
+ sb.setLength(0);
+
+ if (bb!=null && bb.hasRemaining()) {
+ sb.append("0x");
+ while (bb.hasRemaining()) {
+ sb.append(String.format("%02x",bb.get()));
+ }
+ bb.flip();
+ }
+ return new History(
+ row.getUUID(0),
+ row.getString(1),
+ row.getString(2),
+ sb.toString(),
+ row.getString(4),
+ row.getString(5),
+ row.getString(6),
+ row.getInt(7));
+ }
+
+ @Override
+ public String select() {
+ return "SELECT id, action, memo, reconstruct, subject, target, user, yr_mon from authz.history LIMIT 10000000 ";
+ }
+ };
- public History(UUID id, String action, String memo, String subject, String target, String user, int yr_mon) {
+ public History(UUID id, String action, String memo, String subject, String target, String user, int yrMon) {
this.id = id;
this.action = action;
this.memo = memo;
@@ -53,10 +106,10 @@ public class History {
this.subject = subject;
this.target = target;
this.user = user;
- this.yr_mon = yr_mon;
+ this.yrMon = yrMon;
}
- public History(UUID id, String action, String memo, String reconstruct, String subject, String target, String user, int yr_mon) {
+ public History(UUID id, String action, String memo, String reconstruct, String subject, String target, String user, int yrMon) {
this.id = id;
this.action = action;
this.memo = memo;
@@ -64,7 +117,7 @@ public class History {
this.subject = subject;
this.target = target;
this.user = user;
- this.yr_mon = yr_mon;
+ this.yrMon = yrMon;
}
public static void load(Trans trans, Session session, Creator<History> creator, Loader<History> loader) {
@@ -100,7 +153,7 @@ public class History {
public String toString() {
return String.format("%s %d %s, %s, %s, %s, %s",
id.toString(),
- yr_mon,
+ yrMon,
user,
target,
action,
@@ -123,56 +176,4 @@ public class History {
public boolean equals(Object obj) {
return id.equals(obj);
}
-
- public static Creator<History> sansConstruct = new Creator<History> () {
- @Override
- public History create(Row row) {
- return new History(
- row.getUUID(0),
- row.getString(1),
- row.getString(2),
- row.getString(3),
- row.getString(4),
- row.getString(5),
- row.getInt(6));
- }
-
- @Override
- public String select() {
- return "SELECT id, action, memo, subject, target, user, yr_mon from authz.history LIMIT 10000000 ";
- }
- };
-
- public static Creator<History> avecConstruct = new Creator<History> () {
- private final StringBuilder sb = new StringBuilder();
-
- @Override
- public History create(Row row) {
- ByteBuffer bb = row.getBytes(3);
- sb.setLength(0);
-
- if (bb!=null && bb.hasRemaining()) {
- sb.append("0x");
- while (bb.hasRemaining()) {
- sb.append(String.format("%02x",bb.get()));
- }
- bb.flip();
- }
- return new History(
- row.getUUID(0),
- row.getString(1),
- row.getString(2),
- sb.toString(),
- row.getString(4),
- row.getString(5),
- row.getString(6),
- row.getInt(7));
- }
-
- @Override
- public String select() {
- return "SELECT id, action, memo, reconstruct, subject, target, user, yr_mon from authz.history LIMIT 10000000 ";
- }
- };
-
} \ No newline at end of file