Project

General

Profile

« Previous | Next » 

Revision 61553

Added by Konstantina Galouni over 2 years ago

[Trunk | Admin Tools Library]:
1. pom.xml:
a. Added timestamp in properties.
b. In <build> added <resources> with filtering set to true.
2. GlobalVars.java: Added GlobalVars class for date of deploy & date of build.
3. UoaAdminToolsLibraryApplication.java: In EnableConfigurationProperties added GlobalVars.class.
4. AdminToolsLibraryCheckDeployController.java: Added exposing date of deploy and date of build.
5. admintoolslibrary.properties: Added property admintoolslibrary.globalVars.buildDate=@timestamp.

View differences:

modules/uoa-admin-tools-library/trunk/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/AdminToolsLibraryCheckDeployController.java
1 1 
package eu.dnetlib.uoaadmintoolslibrary.controllers;
2 2 

  		




  3
  
  
    
import com.mongodb.BasicDBObject;


  		




  4
  
  
    
import com.mongodb.CommandResult;


  		




  5
  
  
    
import com.mongodb.DBObject;


  		




  
  3
  
    
import eu.dnetlib.uoaadmintoolslibrary.configuration.GlobalVars;


  		




  6
  4
  
    
import eu.dnetlib.uoaadmintoolslibrary.configuration.properties.GoogleConfig;


  		




  7
  5
  
    
import eu.dnetlib.uoaadmintoolslibrary.configuration.properties.MailConfig;


  		




  8
  6
  
    
import org.apache.log4j.Logger;


  		




  ......




  26
  24
  
    
    @Autowired


  		




  27
  25
  
    
    private GoogleConfig googleConfig;


  		




  28
  26
  
    

  		




  
  27
  
    
    @Autowired


  		




  
  28
  
    
    private GlobalVars globalVars;


  		




  
  29
  
    

  		




  29
  30
  
    
    private final Logger log = Logger.getLogger(this.getClass());


  		




  30
  31
  
    

  		




  31
  32
  
    
    @RequestMapping(value = {"", "/health_check"}, method = RequestMethod.GET)


  		




  ......




  46
  47
  
    
        response.put("admintoolslibrary.mail.password", mailConfig.getPassword() == null ? null : "[unexposed value]");


  		




  47
  48
  
    
        response.put("admintoolslibrary.google.secret", googleConfig.getSecret() == null ? null : "[unexposed value]");


  		




  48
  49
  
    

  		




  
  50
  
    
        if(globalVars.date != null) {


  		




  
  51
  
    
            response.put("Date of deploy", globalVars.date.toString());


  		




  
  52
  
    
        }


  		




  
  53
  
    
        if(globalVars.getBuildDate() != null) {


  		




  
  54
  
    
            response.put("Date of build", globalVars.getBuildDate());


  		




  
  55
  
    
        }


  		




  49
  56
  
    
//        response.put("Define also", "admintoolslibrary.mail.username, " +


  		




  50
  57
  
    
//                "admintoolslibrary.mail.password, admintoolslibrary.google.secret");


  		




  51
  58
  
    
        return response;


  		












  

    
      modules/uoa-admin-tools-library/trunk/src/main/java/eu/dnetlib/uoaadmintoolslibrary/UoaAdminToolsLibraryApplication.java
    
  





  1
  1
  
    
package eu.dnetlib.uoaadmintoolslibrary;


  		




  2
  2
  
    

  		




  
  3
  
    
import eu.dnetlib.uoaadmintoolslibrary.configuration.GlobalVars;


  		




  3
  4
  
    
import eu.dnetlib.uoaauthorizationlibrary.configuration.AuthorizationConfiguration;


  		




  4
  5
  
    
import org.springframework.boot.autoconfigure.SpringBootApplication;


  		




  5
  6
  
    
import org.springframework.boot.context.properties.EnableConfigurationProperties;


  		




  ......




  8
  9
  
    
import org.springframework.context.annotation.Import;


  		




  9
  10
  
    

  		




  10
  11
  
    
@SpringBootApplication//(scanBasePackages = {"eu.dnetlib.uoaauthorizationlibrary"})


  		




  11
  
  
    
@EnableConfigurationProperties({MailConfig.class, GoogleConfig.class})


  		




  
  12
  
    
@EnableConfigurationProperties({MailConfig.class, GoogleConfig.class, GlobalVars.class})


  		




  12
  13
  
    
@Import(AuthorizationConfiguration.class)


  		




  13
  14
  
    
public class UoaAdminToolsLibraryApplication {}


  		












  

    
      modules/uoa-admin-tools-library/trunk/src/main/java/eu/dnetlib/uoaadmintoolslibrary/configuration/GlobalVars.java
    
  





  
  1
  
    
package eu.dnetlib.uoaadmintoolslibrary.configuration;


  		




  
  2
  
    

  		




  
  3
  
    
import org.springframework.boot.context.properties.ConfigurationProperties;


  		




  
  4
  
    

  		




  
  5
  
    
import java.util.Date;


  		




  
  6
  
    

  		




  
  7
  
    
@ConfigurationProperties("admintoolslibrary.globalVars")


  		




  
  8
  
    
public class GlobalVars {


  		




  
  9
  
    
    public static Date date = new Date();


  		




  
  10
  
    
    private Date buildDate;


  		




  
  11
  
    

  		




  
  12
  
    
    public String getBuildDate() {


  		




  
  13
  
    
        if(buildDate == null) {


  		




  
  14
  
    
            return null;


  		




  
  15
  
    
        }


  		




  
  16
  
    
        return buildDate.toString();


  		




  
  17
  
    
    }


  		




  
  18
  
    

  		




  
  19
  
    
    public void setBuildDate(Date buildDate) {


  		




  
  20
  
    
        this.buildDate = buildDate;


  		




  
  21
  
    
    }


  		




  
  22
  
    
}


  		












  

    
      modules/uoa-admin-tools-library/trunk/src/main/resources/admintoolslibrary.properties
    
  





  
  1
  
    
admintoolslibrary.globalVars.buildDate=@timestampAdminToolsLibrary@


  		












  

    
      modules/uoa-admin-tools-library/trunk/pom.xml
    
  





  22
  22
  
    
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>


  		




  23
  23
  
    
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>


  		




  24
  24
  
    
        <java.version>1.8</java.version>


  		




  
  25
  
    
        <timestampAdminToolsLibrary>${maven.build.timestamp}</timestampAdminToolsLibrary>


  		




  
  26
  
    
        <maven.build.timestamp.format>E MMM dd HH:mm:ss z yyyy</maven.build.timestamp.format>


  		




  25
  27
  
    
    </properties>


  		




  26
  28
  
    

  		




  27
  29
  
    
    <dependencies>


  		




  ......




  103
  105
  
    
            <!--</plugin>-->


  		




  104
  106
  
    
        </plugins>


  		




  105
  107
  
    
        <finalName>uoa-admin-tools-library</finalName>


  		




  
  108
  
    
        <resources>


  		




  
  109
  
    
            <resource>


  		




  
  110
  
    
                <directory>src/main/resources</directory>


  		




  
  111
  
    
                <filtering>true</filtering>


  		




  
  112
  
    
            </resource>


  		




  
  113
  
    
        </resources>


  		




  106
  114
  
    
    </build>


  		




  107
  115
  
    

  		




  108
  116
  
    

  		












Also available in:  Unified diff