summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--INFO.yaml17
-rw-r--r--auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/approvalsets/Pending.java10
-rw-r--r--auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/LastNotified.java10
-rw-r--r--auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java6
-rw-r--r--auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Notify.java2
-rw-r--r--auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/AAFcli.java2
-rw-r--r--auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java2
-rw-r--r--auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/TypedCode.java2
-rw-r--r--auth/auth-fs/src/main/java/org/onap/aaf/auth/fs/AAF_FS.java2
-rw-r--r--auth/auth-hello/src/main/java/org/onap/aaf/auth/hello/API_Hello.java2
-rw-r--r--auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java2
-rw-r--r--auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java2
-rw-r--r--docs/sections/release-notes.rst3
13 files changed, 25 insertions, 37 deletions
diff --git a/INFO.yaml b/INFO.yaml
index 506303b4..e44b6482 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -28,12 +28,7 @@ meetings:
repeats: 'weekly'
time: '14:00 UTC'
repositories:
- - 'aaf-authz'
- - 'aaf/cadi'
- - 'aaf/luaplugin'
- - 'aaf/oom'
- - 'aaf/sms'
- - 'aaf/sshsm'
+ - 'aaf/authz'
committers:
- <<: *onap_aaf_ptl
- name: 'Kiran Kamineni'
@@ -46,15 +41,5 @@ committers:
company: 'ATT'
id: 'sg481n'
timezone: 'America/Dallas'
- - name: 'Girish Havaldar'
- email: 'hg0071052@techmahindra.com'
- company: 'Techmahindra'
- id: 'giri'
- timezone: 'India/Bangalore'
- - name: 'Huabing Zhao'
- email: 'zhaohuabing@gmail.com'
- company: 'ZTE'
- id: 'Huabing_Zhao'
- timezone: 'China/Chengdu'
tsc:
approval: 'https://lists.onap.org/pipermail/onap-tsc'
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/approvalsets/Pending.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/approvalsets/Pending.java
index eed67338..9a666981 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/approvalsets/Pending.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/approvalsets/Pending.java
@@ -3,6 +3,8 @@
* org.onap.aaf
* ===========================================================================
* Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ *
+ * Modifications Copyright (C) 2019 IBM.
* ===========================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -36,12 +38,12 @@ public class Pending {
/**
* Use this constructor to indicate when last Notified
- * @param last_notified
+ * @param lastNotified
*/
- public Pending(Date last_notified) {
+ public Pending(Date lastNotified) {
qty = 1;
- hasNew = last_notified==null;
- earliest = last_notified;
+ hasNew = lastNotified==null;
+ earliest = lastNotified;
}
/**
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/LastNotified.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/LastNotified.java
index 6f228e08..dfacd81b 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/LastNotified.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/LastNotified.java
@@ -45,7 +45,7 @@ import com.datastax.driver.core.SimpleStatement;
import com.datastax.driver.core.Statement;
public class LastNotified {
- private Map<String,Date> lastNotified = new TreeMap<>();
+ private Map<String,Date> lastNotifiedVar = new TreeMap<>();
private Session session;
public static final Date NEVER = new Date(0);
private static final String SELECT = "SELECT user,target,key,last FROM authz.notified";
@@ -67,7 +67,7 @@ public class LastNotified {
query.append('\'');
if(cnt>=30) {
endQuery(query);
- add(session.execute(query.toString()),lastNotified, (x,y) -> false);
+ add(session.execute(query.toString()),lastNotifiedVar, (x,y) -> false);
query.setLength(0);
startQuery(query);
cnt=0;
@@ -75,7 +75,7 @@ public class LastNotified {
}
if(cnt>0) {
endQuery(query);
- add(session.execute(query.toString()),lastNotified, (x,y) -> false);
+ add(session.execute(query.toString()),lastNotifiedVar, (x,y) -> false);
}
}
@@ -93,7 +93,7 @@ public class LastNotified {
}
public Date lastNotified(String key) {
- Date d = lastNotified.get(key);
+ Date d = lastNotifiedVar.get(key);
return d==null?NEVER:d;
}
@@ -150,7 +150,7 @@ public class LastNotified {
try {
Statement stmt = new SimpleStatement( SELECT );
results = session.execute(stmt);
- add(results,lastNotified, (fullKey, last) -> {
+ add(results,lastNotifiedVar, (fullKey, last) -> {
if(delRange.inRange(last)) {
String[] params = Split.splitTrim('|', fullKey,3);
if(params.length==3) {
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java
index 5780c603..d7d97ad8 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java
@@ -391,8 +391,7 @@ public class Analyze extends Batch {
return;
}
// Just let expired UserRoles sit until deleted
- if(futureRange.inRange(ur.expires())) {
- if(!mur.containsKey(ur.user() + '|' + ur.role())) {
+ if(futureRange.inRange(ur.expires())&&(!mur.containsKey(ur.user() + '|' + ur.role()))) {
// Cannot just delete owners, unless there is at least one left. Process later
if ("owner".equals(ur.rname())) {
Set<UserRole> urs = owners.get(ur.role());
@@ -410,8 +409,7 @@ public class Analyze extends Batch {
}
}
}
- }
- }
+ }
} catch (OrganizationException e) {
noAvg.error().log(e);
}
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Notify.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Notify.java
index 5ad6163f..54cb7378 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Notify.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Notify.java
@@ -290,7 +290,7 @@ import org.onap.aaf.misc.env.util.Chrono;
Pending p;
tt = trans.start("Notify for Pending", Trans.SUB);
- List<String> idList = new ArrayList<String>();
+ List<String> idList = new ArrayList<>();
String id;
try {
for(Entry<String, Pending> es : mpending.entrySet()) {
diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/AAFcli.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/AAFcli.java
index bd8f1a52..51986b92 100644
--- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/AAFcli.java
+++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/AAFcli.java
@@ -90,7 +90,7 @@ public class AAFcli {
private static int globalDelay=0;
// Create when only have Access
- public AAFcli(Access access, Writer wtr, HMangr hman, SecurityInfoC<HttpURLConnection> si, SecuritySetter<HttpURLConnection> ss) throws APIException, CadiException {
+ public AAFcli(Access access, Writer wtr, HMangr hman, SecurityInfoC<HttpURLConnection> si, SecuritySetter<HttpURLConnection> ss) throws APIException {
this(access,new AuthzEnv(access.getProperties()),wtr,hman, si,ss);
}
diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java
index 4f2ba4f2..2ada75d2 100644
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/OrganizationFactory.java
@@ -142,7 +142,7 @@ public class OrganizationFactory {
return org;
}
- public static Organization get(AuthzTrans trans) throws OrganizationException {
+ public static Organization get(AuthzTrans trans){
String domain = FQI.reverseDomain(trans.user());
Organization org = orgs.get(domain);
if (org==null) {
diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/TypedCode.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/TypedCode.java
index 1a66cf7d..6f1372f3 100644
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/TypedCode.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/TypedCode.java
@@ -128,7 +128,7 @@ public class TypedCode<TRANS extends Trans> extends Content<TRANS> {
return type.y.y.add(new Pair<String,Object>(tag,"version".equals(tag)?new Version(value):value));
}
- public Pair<String, Pair<HttpCode<TRANS, ?>, List<Pair<String, Object>>>> prep(TRANS trans, String compare) throws IOException, ServletException {
+ public Pair<String, Pair<HttpCode<TRANS, ?>, List<Pair<String, Object>>>> prep(TRANS trans, String compare){
Pair<String, Pair<HttpCode<TRANS,?>, List<Pair<String, Object>>>> c,rv=null;
if (types.size()==1 && "".equals((c=types.get(0)).x)) { // if there are no checks for type, skip
rv = c;
diff --git a/auth/auth-fs/src/main/java/org/onap/aaf/auth/fs/AAF_FS.java b/auth/auth-fs/src/main/java/org/onap/aaf/auth/fs/AAF_FS.java
index df05da93..cee06dd2 100644
--- a/auth/auth-fs/src/main/java/org/onap/aaf/auth/fs/AAF_FS.java
+++ b/auth/auth-fs/src/main/java/org/onap/aaf/auth/fs/AAF_FS.java
@@ -49,7 +49,7 @@ import org.onap.aaf.misc.env.APIException;
public class AAF_FS extends AbsService<AuthzEnv, AuthzTrans> {
- public AAF_FS(final AuthzEnv env) throws APIException, IOException, CadiException {
+ public AAF_FS(final AuthzEnv env) throws IOException, CadiException {
super(env.access(),env);
try {
///////////////////////
diff --git a/auth/auth-hello/src/main/java/org/onap/aaf/auth/hello/API_Hello.java b/auth/auth-hello/src/main/java/org/onap/aaf/auth/hello/API_Hello.java
index 7fef0ba2..814dff27 100644
--- a/auth/auth-hello/src/main/java/org/onap/aaf/auth/hello/API_Hello.java
+++ b/auth/auth-hello/src/main/java/org/onap/aaf/auth/hello/API_Hello.java
@@ -56,7 +56,7 @@ public class API_Hello {
* @param facade
* @throws Exception
*/
- public static void init(final AAF_Hello oauthHello) throws Exception {
+ public static void init(final AAF_Hello oauthHello){
////////
// Simple "GET" API
///////
diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java
index b481ff9a..0ad14c84 100644
--- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java
+++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java
@@ -170,7 +170,7 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
// Add other Supported APIs here as created
}
- public void routeAll(HttpMethods meth, String path, API api, LocateCode code) throws Exception {
+ public void routeAll(HttpMethods meth, String path, API api, LocateCode code){
route(env,meth,path,code,""); // this will always match
}
diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java
index e080e7ee..1ace384e 100644
--- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java
+++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java
@@ -47,7 +47,7 @@ public class LocateServiceImpl<IN,OUT,ERROR>
private ConfigDAO configDAO;
private boolean permToRegister;
- public LocateServiceImpl(AuthzTrans trans, AAF_Locate locate, Mapper<IN,OUT,Endpoints,MgmtEndpoints,Configuration,ERROR> mapper) throws APIException {
+ public LocateServiceImpl(AuthzTrans trans, AAF_Locate locate, Mapper<IN,OUT,Endpoints,MgmtEndpoints,Configuration,ERROR> mapper){
this.mapper = mapper;
this.locateDAO = locate.locateDAO;
this.configDAO = locate.configDAO;
diff --git a/docs/sections/release-notes.rst b/docs/sections/release-notes.rst
index ed91732c..09125a89 100644
--- a/docs/sections/release-notes.rst
+++ b/docs/sections/release-notes.rst
@@ -27,6 +27,9 @@ An important change, however, is that the AAF Locator requires internal K8s Apps
**Bug Fixes**
- `AAF-859 <https://jira.onap.org/browse/AAF-859>`_ Images hardcoded in AAF helm deployment yamls
+**Known Issues - solve in Frankfurt**
+ - `AAF-962 <https://jira.onap.org/browse/AAF-962>`_ AAF Certs could not generate...
+
Version: 2.1.13 (Dublin, 4.0.0-ONAP)
---------------------------------------