datarouter-prov code clean - remove tabs

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / beans / PublishRecord.java

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/PublishRecord.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/PublishRecord.java
index 74a97cc..e7575ff 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/PublishRecord.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/PublishRecord.java
@@ -7,9 +7,9 @@
  * * Licensed under the Apache License, Version 2.0 (the "License");\r
  * * you may not use this file except in compliance with the License.\r
  * * You may obtain a copy of the License at\r
- * * \r
+ * *\r
  *  *      http://www.apache.org/licenses/LICENSE-2.0\r
- * * \r
+ * *\r
  *  * Unless required by applicable law or agreed to in writing, software\r
  * * distributed under the License is distributed on an "AS IS" BASIS,\r
  * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
@@ -35,120 +35,124 @@ import org.onap.dmaap.datarouter.provisioning.utils.LOGJSONObject;
 \r
 /**\r
  * The representation of a Publish Record, as retrieved from the DB.\r
+ *\r
  * @author Robert Eby\r
  * @version $Id: PublishRecord.java,v 1.6 2013/10/28 18:06:53 eby Exp $\r
  */\r
 public class PublishRecord extends BaseLogRecord {\r
-       private String feedFileid;\r
-       private String remoteAddr;\r
-       private String user;\r
-       private int status;\r
-\r
-       public PublishRecord(String[] pp) throws ParseException {\r
-               super(pp);\r
-//             This is too slow!\r
-//             Matcher m = Pattern.compile(".*/publish/(\\d+)/(.*)$").matcher(pp[4]);\r
-//             if (!m.matches())\r
-//                     throw new ParseException("bad pattern", 0);\r
-//             this.feedFileid = m.group(2);\r
-               int ix = pp[4].indexOf("/publish/");\r
-               if (ix < 0)\r
-                       throw new ParseException("bad pattern", 0);\r
-               ix = pp[4].indexOf('/', ix+9);\r
-               if (ix < 0)\r
-                       throw new ParseException("bad pattern", 0);\r
-               this.feedFileid = pp[4].substring(ix+1);\r
-               this.remoteAddr = pp[8];\r
-               this.user       = pp[9];\r
-               this.status     = Integer.parseInt(pp[10]);\r
-       }\r
-       public PublishRecord(ResultSet rs) throws SQLException {\r
-               super(rs);\r
-               this.feedFileid = rs.getString("FEED_FILEID");\r
-               this.remoteAddr = rs.getString("REMOTE_ADDR");\r
-               this.user       = rs.getString("USER");\r
-               this.status     = rs.getInt("STATUS");\r
-       }\r
-       public String getFeedFileid() {\r
-               return feedFileid;\r
-       }\r
-\r
-       public void setFeedFileid(String feedFileid) {\r
-               this.feedFileid = feedFileid;\r
-       }\r
-\r
-       public String getRemoteAddr() {\r
-               return remoteAddr;\r
-       }\r
-\r
-       public void setRemoteAddr(String remoteAddr) {\r
-               this.remoteAddr = remoteAddr;\r
-       }\r
-\r
-       public String getUser() {\r
-               return user;\r
-       }\r
-\r
-       public void setUser(String user) {\r
-               this.user = user;\r
-       }\r
-\r
-       public int getStatus() {\r
-               return status;\r
-       }\r
-\r
-       public void setStatus(int status) {\r
-               this.status = status;\r
-       }\r
-       \r
-       \r
-       public LOGJSONObject reOrderObject(LOGJSONObject jo) {\r
-               LinkedHashMap<String,Object> logrecordObj = new LinkedHashMap<String,Object>();\r
-               \r
-               \r
-               logrecordObj.put("statusCode", jo.get("statusCode"));\r
-               logrecordObj.put("publishId", jo.get("publishId"));\r
-               logrecordObj.put("requestURI", jo.get("requestURI"));\r
-               logrecordObj.put("sourceIP", jo.get("sourceIP"));\r
-               logrecordObj.put("method", jo.get("method"));\r
-               logrecordObj.put("contentType", jo.get("contentType"));\r
-               logrecordObj.put("endpointId", jo.get("endpointId"));\r
-               logrecordObj.put("type", jo.get("type"));\r
-               logrecordObj.put("date", jo.get("date"));\r
-               logrecordObj.put("contentLength", jo.get("contentLength"));\r
-               \r
-               LOGJSONObject newjo = new LOGJSONObject(logrecordObj);\r
-               return newjo;\r
-       }\r
-       \r
-       @Override\r
-       public LOGJSONObject asJSONObject() {\r
-               LOGJSONObject jo = super.asJSONObject();\r
-               jo.put("type", "pub");\r
-//             jo.put("feedFileid", feedFileid);\r
-//             jo.put("remoteAddr", remoteAddr);\r
-//             jo.put("user", user);\r
-               jo.put("sourceIP", remoteAddr);\r
-               jo.put("endpointId", user);\r
-               jo.put("statusCode", status);\r
-               \r
-               LOGJSONObject newjo = this.reOrderObject(jo);\r
-               \r
-               return newjo;\r
-       }\r
-       @Override\r
-       public void load(PreparedStatement ps) throws SQLException {\r
-               ps.setString(1, "pub");         // field 1: type\r
-               super.load(ps);                         // loads fields 2-8\r
-               ps.setString( 9, getFeedFileid());\r
-               ps.setString(10, getRemoteAddr());\r
-               ps.setString(11, getUser());\r
-               ps.setInt   (12, getStatus());\r
-               ps.setNull  (13, Types.INTEGER);\r
-               ps.setNull  (14, Types.VARCHAR);\r
-               ps.setNull  (15, Types.INTEGER);\r
-               ps.setNull  (16, Types.INTEGER);\r
-               ps.setNull  (17, Types.VARCHAR);\r
-               ps.setNull  (19, Types.BIGINT);\r
-       }\r
+    private String feedFileid;\r
+    private String remoteAddr;\r
+    private String user;\r
+    private int status;\r
+\r
+    public PublishRecord(String[] pp) throws ParseException {\r
+        super(pp);\r
+//        This is too slow!\r
+//        Matcher m = Pattern.compile(".*/publish/(\\d+)/(.*)$").matcher(pp[4]);\r
+//        if (!m.matches())\r
+//            throw new ParseException("bad pattern", 0);\r
+//        this.feedFileid = m.group(2);\r
+        int ix = pp[4].indexOf("/publish/");\r
+        if (ix < 0)\r
+            throw new ParseException("bad pattern", 0);\r
+        ix = pp[4].indexOf('/', ix + 9);\r
+        if (ix < 0)\r
+            throw new ParseException("bad pattern", 0);\r
+        this.feedFileid = pp[4].substring(ix + 1);\r
+        this.remoteAddr = pp[8];\r
+        this.user = pp[9];\r
+        this.status = Integer.parseInt(pp[10]);\r
+    }\r
+\r
+    public PublishRecord(ResultSet rs) throws SQLException {\r
+        super(rs);\r
+        this.feedFileid = rs.getString("FEED_FILEID");\r
+        this.remoteAddr = rs.getString("REMOTE_ADDR");\r
+        this.user = rs.getString("USER");\r
+        this.status = rs.getInt("STATUS");\r
+    }\r
+\r
+    public String getFeedFileid() {\r
+        return feedFileid;\r
+    }\r
+\r
+    public void setFeedFileid(String feedFileid) {\r
+        this.feedFileid = feedFileid;\r
+    }\r
+\r
+    public String getRemoteAddr() {\r
+        return remoteAddr;\r
+    }\r
+\r
+    public void setRemoteAddr(String remoteAddr) {\r
+        this.remoteAddr = remoteAddr;\r
+    }\r
+\r
+    public String getUser() {\r
+        return user;\r
+    }\r
+\r
+    public void setUser(String user) {\r
+        this.user = user;\r
+    }\r
+\r
+    public int getStatus() {\r
+        return status;\r
+    }\r
+\r
+    public void setStatus(int status) {\r
+        this.status = status;\r
+    }\r
+\r
+\r
+    public LOGJSONObject reOrderObject(LOGJSONObject jo) {\r
+        LinkedHashMap<String, Object> logrecordObj = new LinkedHashMap<String, Object>();\r
+\r
+\r
+        logrecordObj.put("statusCode", jo.get("statusCode"));\r
+        logrecordObj.put("publishId", jo.get("publishId"));\r
+        logrecordObj.put("requestURI", jo.get("requestURI"));\r
+        logrecordObj.put("sourceIP", jo.get("sourceIP"));\r
+        logrecordObj.put("method", jo.get("method"));\r
+        logrecordObj.put("contentType", jo.get("contentType"));\r
+        logrecordObj.put("endpointId", jo.get("endpointId"));\r
+        logrecordObj.put("type", jo.get("type"));\r
+        logrecordObj.put("date", jo.get("date"));\r
+        logrecordObj.put("contentLength", jo.get("contentLength"));\r
+\r
+        LOGJSONObject newjo = new LOGJSONObject(logrecordObj);\r
+        return newjo;\r
+    }\r
+\r
+    @Override\r
+    public LOGJSONObject asJSONObject() {\r
+        LOGJSONObject jo = super.asJSONObject();\r
+        jo.put("type", "pub");\r
+//        jo.put("feedFileid", feedFileid);\r
+//        jo.put("remoteAddr", remoteAddr);\r
+//        jo.put("user", user);\r
+        jo.put("sourceIP", remoteAddr);\r
+        jo.put("endpointId", user);\r
+        jo.put("statusCode", status);\r
+\r
+        LOGJSONObject newjo = this.reOrderObject(jo);\r
+\r
+        return newjo;\r
+    }\r
+\r
+    @Override\r
+    public void load(PreparedStatement ps) throws SQLException {\r
+        ps.setString(1, "pub");        // field 1: type\r
+        super.load(ps);                // loads fields 2-8\r
+        ps.setString(9, getFeedFileid());\r
+        ps.setString(10, getRemoteAddr());\r
+        ps.setString(11, getUser());\r
+        ps.setInt(12, getStatus());\r
+        ps.setNull(13, Types.INTEGER);\r
+        ps.setNull(14, Types.VARCHAR);\r
+        ps.setNull(15, Types.INTEGER);\r
+        ps.setNull(16, Types.INTEGER);\r
+        ps.setNull(17, Types.VARCHAR);\r
+        ps.setNull(19, Types.BIGINT);\r
+    }\r
 }\r