Streamlined Rest-Endpoints and Restructured ngServices and -Resources

Author: Johannes Stelzer

spring-boot-admin-server-ui/app/js/app.js

@@ -61,7 +61,7 @@ springBootAdmin.config(function ($stateProvider, $urlRouterProvider) {
             templateUrl: 'views/apps.html',
             resolve: {
                 application: function ($stateParams, Application) {
-                    return Application.query({
+                    return Application.get({
                             id: $stateParams.id
                         })
                         .$promise;

spring-boot-admin-server-ui/app/js/controller/detailsClasspathCtrl.js renamed to spring-boot-admin-server-ui/app/js/controller/apps/details/classpathCtrl.js

@@ -15,9 +15,9 @@
  */
 'use strict';
 
-module.exports = function ($scope, application, ApplicationDetails) {
+module.exports = function ($scope, application) {
     $scope.application = application;
-    ApplicationDetails.getEnv(application)
+    application.getEnv()
         .success(function (env) {
             var separator = env.systemProperties['path.separator'];
             $scope.classpath = env.systemProperties['java.class.path'].split(separator);

spring-boot-admin-server-ui/app/js/controller/detailsEnvCtrl.js renamed to spring-boot-admin-server-ui/app/js/controller/apps/details/envCtrl.js

@@ -15,9 +15,10 @@
  */
 'use strict';
 
-module.exports = function ($scope, application, ApplicationDetails) {
+module.exports = function ($scope, application) {
     $scope.application = application;
-    ApplicationDetails.getEnv(application)
+
+    application.getEnv(application)
         .success(function (env) {
             $scope.env = env;
         })

spring-boot-admin-server-ui/app/js/controller/detailsMetricsCtrl.js renamed to spring-boot-admin-server-ui/app/js/controller/apps/details/metricsCtrl.js

@@ -15,14 +15,14 @@
  */
 'use strict';
 
-module.exports = function ($scope, application, ApplicationDetails, Abbreviator, MetricsHelper) {
+module.exports = function ($scope, application, Abbreviator, MetricsHelper) {
     $scope.counters = [];
     $scope.countersMax = 0;
     $scope.gauges = [];
     $scope.gaugesMax = 0;
     $scope.showRichGauges = false;
 
-    ApplicationDetails.getMetrics(application)
+    application.getMetrics()
         .success(function (metrics) {
             function merge(array, obj) {
                 for (var i = 0; i < array.length; i++) {

spring-boot-admin-server-ui/app/js/controller/detailsPropsCtrl.js renamed to spring-boot-admin-server-ui/app/js/controller/apps/details/propsCtrl.js

@@ -15,9 +15,10 @@
  */
 'use strict';
 
-module.exports = function ($scope, application, ApplicationDetails) {
+module.exports = function ($scope, application) {
     $scope.application = application;
-    ApplicationDetails.getEnv(application)
+
+    application.getEnv()
         .success(function (env) {
             $scope.props = [];
             for (var attr in env) {

spring-boot-admin-server-ui/app/js/controller/detailsCtrl.js renamed to spring-boot-admin-server-ui/app/js/controller/apps/detailsCtrl.js

@@ -15,31 +15,31 @@
  */
 'use strict';
 
-module.exports = function ($scope, $interval, application, ApplicationDetails, MetricsHelper) {
+module.exports = function ($scope, $interval, application, MetricsHelper) {
     $scope.application = application;
 
     var start = Date.now();
     $interval(function () {
         $scope.ticks = Date.now() - start;
     }, 1000);
 
-    ApplicationDetails.getInfo(application)
+    application.getInfo()
         .success(function (info) {
             $scope.info = info;
         })
         .error(function (error) {
             $scope.error = error;
         });
 
-    ApplicationDetails.getHealth(application)
+    application.getHealth()
         .success(function (health) {
             $scope.health = health;
         })
         .error(function (health) {
             $scope.health = health;
         });
 
-    ApplicationDetails.getMetrics(application)
+    application.getMetrics()
         .success(function (metrics) {
             $scope.metrics = metrics;
             $scope.metrics['mem.used'] = $scope.metrics.mem - $scope.metrics['mem.free'];

spring-boot-admin-server-ui/app/js/controller/jmxCtrl.js renamed to spring-boot-admin-server-ui/app/js/controller/apps/jmxCtrl.js

@@ -15,9 +15,9 @@
  */
 'use strict';
 
-module.exports = function ($scope, application, ApplicationThreads) {
+module.exports = function ($scope, application) {
     $scope.dumpThreads = function () {
-        ApplicationThreads.getDump(application)
+        application.getThreadDump()
             .success(function (dump) {
                 $scope.dump = dump;
 

spring-boot-admin-server-ui/app/js/controller/loggingCtrl.js renamed to spring-boot-admin-server-ui/app/js/controller/apps/loggingCtrl.js

@@ -15,14 +15,14 @@
  */
 'use strict';
 
-module.exports = function ($scope, application, ApplicationTrace, $interval) {
+module.exports = function ($scope, application, $interval) {
     $scope.lastTraceTime = 0;
     $scope.traces = [];
     $scope.refresher = null;
     $scope.refreshInterval = 5;
 
     $scope.refresh = function () {
-        ApplicationTrace.getTraces(application)
+        application.getTraces()
             .success(function (traces) {
                 for (var i = 0; i < traces.length; i++) {
                     if (traces[i].timestamp > $scope.lastTraceTime) {